diff options
| -rw-r--r-- | _layouts/default.html | 11 | ||||
| -rw-r--r-- | _layouts/page.html | 3 | ||||
| -rw-r--r-- | getting_started.md | 3 | ||||
| -rw-r--r-- | installing/ami.md | 15 | ||||
| -rw-r--r-- | installing/manual_install.md | 12 | ||||
| -rw-r--r-- | search.md | 7 |
6 files changed, 35 insertions, 16 deletions
diff --git a/_layouts/default.html b/_layouts/default.html index 4ab06f601..d91d754db 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -19,7 +19,18 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); + (function() { + var cx = '012469947838795749698:abakbfgsmqm'; + var gcse = document.createElement('script'); + gcse.type = 'text/javascript'; + gcse.async = true; + gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + + '//www.google.com/cse/cse.js?cx=' + cx; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(gcse, s); + })(); </script> + </head> <body> diff --git a/_layouts/page.html b/_layouts/page.html index 6f060d252..d2952cec4 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -10,6 +10,9 @@ layout: default <div class="secondary-content-column"> <nav class="sidebar"> <ul> + <li> + <gcse:searchbox-only></gcse:searchbox-only> + </li> <li><a href="{{ site.baseurl }}">Documentation</a> <ul> <li><a href="{{ site.baseurl }}glossary">Glossary</a></li> diff --git a/getting_started.md b/getting_started.md index b7fbd57cd..2911aecf3 100644 --- a/getting_started.md +++ b/getting_started.md @@ -114,8 +114,7 @@ operating system, though any sort of Linux should do. Rackspace offer suitable cloud servers, which start out at around $25 / month. Then your tech person should follow the [installation documentation]({{ site.baseurl }}installing). -Alternatively, you could use Amazon Web Services. If you've not used them -before, you can get a free "micro" instance for twelve months. This has the +Alternatively, you could use Amazon Web Services. This has the added advantage that you can use our preconfigured [Alaveteli EC2 AMI]({{ site.baseurl }}installing/ami) to get you started almost instantly. However, it's more expensive than Rackspace, diff --git a/installing/ami.md b/installing/ami.md index 47dd95565..e2c113eba 100644 --- a/installing/ami.md +++ b/installing/ami.md @@ -19,16 +19,15 @@ server on an Amazon EC2 instance. This creates an instance that runs in development mode, so we wouldn't recommend you use it for a production system without changing the configuration. -If you haven't used Amazon Web Services before, then you can get a Micro -instance which will be [free for a year](http://aws.amazon.com/free/). You will -find that a micro instance isn't powerful enough for anything other very basic -testing of Alaveteli, however. +Unfortunately, Alaveteli will not run properly on a free Micro +instance due to the low amount of memory available on those +instances; you will need to use at least a Small instance, which +Amazon will charge for. -The AMI can be found in the EU West (Ireland) region, with the ID ami-0f24c678 -and name “Basic Alaveteli installation 2013-10-31”. You can launch an instance +The AMI can be found in the EU West (Ireland) region, with the ID ami-8603f4f1 +and name “Basic Alaveteli installation 2014-01-29”. You can launch an instance based on that AMI with [this -link](https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-0f2 -4c678). +link](https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-8603f4f1). When you create an EC2 instance based on that AMI, make sure that you choose Security Groups that allows at least inbound HTTP, HTTPS, SSH and, if you want diff --git a/installing/manual_install.md b/installing/manual_install.md index 100908be5..01e868551 100644 --- a/installing/manual_install.md +++ b/installing/manual_install.md @@ -7,12 +7,12 @@ title: Manual installation # Manual Installation <p class="lead"> - The following instructions describe the step-by-step process for - installing Alavetli. <em>You don't necessarily need to do it this - way:</em> it's usually easier to use the - <a href="{{ site.baseurl }}installing/script">installation script</a> - or the - <a href="{{ site.baseurl }}installing/ami">Amazon EC2 AMI</a>. + The following instructions describe the step-by-step process for + installing Alaveteli. <em>You don't necessarily need to do it this + way:</em> it's usually easier to use the + <a href="{{ site.baseurl }}installing/script">installation script</a> + or the + <a href="{{ site.baseurl }}installing/ami">Amazon EC2 AMI</a>. </p> Note that there are [other ways to install Alaveteli]({{ site.baseurl }}installing). diff --git a/search.md b/search.md new file mode 100644 index 000000000..d5d4b49f3 --- /dev/null +++ b/search.md @@ -0,0 +1,7 @@ +--- +layout: page +title: Search +--- +Search documentation +==================== +<gcse:searchresults-only></gcse:searchresults-only> |