aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-07-18 15:44:02 +0100
committerGareth Rees <gareth@mysociety.org>2014-08-21 17:36:42 +0100
commit2c52581f703b3c85c45b4e15db6a3ede743655d6 (patch)
treea1530cb5bf9f13a05ab3d0c0afedc3f145f7175c
parentacace29a8d443e30316ba784286d1556975f0895 (diff)
Update instructions on getting Alaveteli
- Clone master by default because stable releases will cause less problems for new users - Use recursive option to clone and init submodules
-rw-r--r--docs/installing/manual_install.md27
1 files changed, 11 insertions, 16 deletions
diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md
index 6f244d3d5..9c554f035 100644
--- a/docs/installing/manual_install.md
+++ b/docs/installing/manual_install.md
@@ -198,26 +198,21 @@ Create a new linux user to run the Alaveteli application.
## Get Alaveteli
-To start with, you may need to install git, e.g. with `apt-get install
-git-core`
+Create the target directory and clone the Alaveteli source code in to this directory:
-Next, get hold of the Alaveteli source code from github:
+ mkdir -p /var/www/alaveteli
+ chown alaveteli:alaveteli /var/www/alaveteli
+ sudo -u alaveteli git clone --recursive \
+ --branch master \
+ https://github.com/mysociety/alaveteli.git /var/www/alaveteli
- git clone https://github.com/mysociety/alaveteli.git
- cd alaveteli
+This clones the master branch which always contains the latest stable release. If you want to try out the latest (possibly buggy) code you can switch to the `rails-3-develop` branch.
-This will get the rails-3-develop branch, which has the latest (possibly buggy)
-code. If you don't want to add or try new features, swap to the master branch
-(which always contains the latest stable release):
+ pushd /var/www/alaveteli
+ sudo -u alaveteli git checkout rails-3-develop
+ popd
- git checkout master
-
-## Install mySociety libraries
-
-Next, install mySociety's common ruby libraries. To fetch the contents of the
-submodules, run:
-
- git submodule update --init
+The `--recursive` option installs mySociety's common libraries which are required to run Alaveteli.
## Install the dependencies