aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installing/manual_install.md
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-07-07 18:07:14 +0100
committerLouise Crow <louise.crow@gmail.com>2014-07-08 12:25:12 +0100
commit0b2c222ba575f7c166cd6c6612286f6153497e64 (patch)
tree68fa2a9adf0783f8bb34cfad21aa8aecf227620c /docs/installing/manual_install.md
parent404f67a660a66cd1bed82a1c29d8d3f0c73784a3 (diff)
Clarify instructions for installing mysociety versions of packages
Add wheezy, don't overwrite /etc/apt/preferences if it's already there. Add section for squeeze that says you don't need to do anything.
Diffstat (limited to 'docs/installing/manual_install.md')
-rw-r--r--docs/installing/manual_install.md21
1 files changed, 16 insertions, 5 deletions
diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md
index 47ed92591..f5038a46c 100644
--- a/docs/installing/manual_install.md
+++ b/docs/installing/manual_install.md
@@ -83,7 +83,7 @@ Add the following repositories to `/etc/apt/sources.list`:
The squeeze-backports repository is providing a more recent version of rubygems, and the wheezy repository is providing bundler. You should configure package-pinning to reduce the priority of the wheezy repository so other packages aren't pulled from it.
- cat > /etc/apt/preferences <<EOF
+ cat >> /etc/apt/preferences <<EOF
Package: bundler
Pin: release n=wheezy
@@ -137,28 +137,39 @@ The raring repo is used here to get a more recent version of bundler and pdftk.
### Packages customised by mySociety
-If you're using Debian, you should add the mySociety Debian archive to your
+If you're using Debian or Ubuntu, you should add the mySociety Debian archive to your
apt sources. Note that mySociety packages are currently only built for 64-bit Debian.
+**Debian Squeeze, Wheezy or Ubuntu Precise**
+
cat > /etc/apt/sources.list.d/mysociety-debian.list <<EOF
deb http://debian.mysociety.org squeeze main
EOF
+The repository above lets you install `wkhtmltopdf-static` and `pdftk` (for squeeze) using `apt`.
+
Add the GPG key from the
[mySociety Debian Package Repository](http://debian.mysociety.org/).
wget -O - https://debian.mysociety.org/debian.mysociety.org.gpg.key | sudo apt-key add -
+
+**Debian Wheezy or Ubuntu Precise**
+
You should also configure package-pinning to reduce the priority of this
-repository.
+repository - we only want to pull wkhtmltopdf-static from mysociety.
+
+ cat >> /etc/apt/preferences <<EOF
- cat > /etc/apt/preferences <<EOF
Package: *
Pin: origin debian.mysociety.org
Pin-Priority: 50
EOF
-If you're using some other platform, you can optionally install these
+**Debian Squeeze**
+
+No special package pinning is required.
+
dependencies manually, as follows:
1. If you would like users to be able to get pretty PDFs as part of the