From 57a1a02b52716bc223ae9e6dc08f0cc2b88071ef Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Mon, 2 Apr 2012 14:21:26 +0100 Subject: Fix typo in link --- doc/INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/INSTALL.md b/doc/INSTALL.md index 8c4ed505b..0c447435d 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -6,7 +6,7 @@ deployment platform. Commands are intended to be run via the terminal or over ssh. As an aid to evaluation, there is an -[Amazon AMI](https://github.com/sebbacon/alaveteli/wiki/Alaveteli-ec2-amix) +[Amazon AMI](https://github.com/sebbacon/alaveteli/wiki/Alaveteli-ec2-ami) with all these steps configured. It is *not* production-ready. # Get Alaveteli -- cgit v1.2.3 From 511e1a0e9fd7cdc887c9c3c0c7dfc7a2f51d86ac Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Mon, 2 Apr 2012 14:25:25 +0100 Subject: Reorder the wording so that it's clear before you do this step (just tripped me up) --- doc/INSTALL.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/INSTALL.md b/doc/INSTALL.md index 0c447435d..57514332b 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -37,7 +37,11 @@ packages by adding the following to `/etc/apt/sources.list` and running `apt-get update`: deb http://debian.mysociety.org squeeze main - + +If you don't set up that mySociety Debian source (e.g. if you're +running Ubuntu), you should comment out `wkhtmltopdf-static` from +`config/packages`, as it won't install in the next step + Now install the packages that are listed in config/packages using apt-get e.g.: @@ -45,10 +49,7 @@ e.g.: Some of the files also have a version number listed in config/packages - check that you have appropriate versions installed. Some also list -"|" and offer a choice of packages. If you've not set up the -mySociety Debian source (e.g. if you're running Ubuntu), you should -comment out `wkhtmltopdf-static` from `config/packages`, as it won't -install. +"|" and offer a choice of packages. # Install Ruby dependencies -- cgit v1.2.3 From 6bab15e650fd2a2e6d23bd2424c6922d0d519552 Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Mon, 2 Apr 2012 14:43:26 +0100 Subject: Correct constant name --- doc/INSTALL-exim4.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/INSTALL-exim4.md b/doc/INSTALL-exim4.md index 82c1aba45..13ca9a56c 100644 --- a/doc/INSTALL-exim4.md +++ b/doc/INSTALL-exim4.md @@ -34,7 +34,7 @@ In `/etc/exim4/conf.d/transport/04_alaveteli`: user = ALAVETELI_USER group = ALAVETELI_USER -And, assuming you set `OPTION_INCOMING_EMAIL_PREFIX` in your config at +And, assuming you set `INCOMING_EMAIL_PREFIX` in your config at `config/general` to "foi+", create `config/aliases` with the following content: -- cgit v1.2.3