From e71d580acd2fa59874e29fa2a11a9b631370f36e Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 7 Jul 2014 16:37:27 +0100 Subject: Add wheezy to the list of OSes Extend the locale instructions to either version of Debian. --- docs/installing/manual_install.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/installing/manual_install.md') diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md index d3a629155..1b9df6abe 100644 --- a/docs/installing/manual_install.md +++ b/docs/installing/manual_install.md @@ -19,15 +19,15 @@ Note that there are [other ways to install Alaveteli]({{ site.baseurl }}docs/ins ## Target operating system -These instructions assume Debian Squeeze (64-bit) or Ubuntu 12.04 LTS -(precise). Debian Squeeze is the best supported deployment platform. We also +These instructions assume Debian Wheezy or Squeeze (64-bit) or Ubuntu 12.04 LTS +(precise). Debian is the best supported deployment platform. We also have instructions for [installing on MacOS]({{ site.baseurl }}docs/installing/macos/). Commands are intended to be run via the terminal or over ssh. ## Set the locale -**Debian Squeeze** +**Debian Wheezy or Squeeze** Follow the [Debian guide](https://wiki.debian.org/Locale#Standard) for configuring the locale of the operating system. -- cgit v1.2.3 From 34e19dea411b1ee8827db05e8bc475b2b0809490 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 7 Jul 2014 16:43:27 +0100 Subject: More descriptive heading and make headings same level --- docs/installing/manual_install.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/installing/manual_install.md') diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md index 1b9df6abe..c5110fe55 100644 --- a/docs/installing/manual_install.md +++ b/docs/installing/manual_install.md @@ -60,7 +60,7 @@ submodules, run: git submodule update --init -## Install system dependencies +## Prepare to install system dependencies using OS packages These are packages that the software depends on: third-party software used to parse documents, host the site, and so on. There are also packages that contain @@ -132,7 +132,7 @@ you kill it), patch it yourself, or use the Debian package compiled by mySociety (see link in [issue 305](https://github.com/mysociety/alaveteli/issues/305)) -### Install the dependencies +## Install the dependencies Refresh the sources after adding the extra repositories: -- cgit v1.2.3 From 2c8bd801014825dbc3763a7c5d5ed19628379d68 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 7 Jul 2014 16:43:57 +0100 Subject: Note requirement for root privileges --- docs/installing/manual_install.md | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/installing/manual_install.md') diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md index c5110fe55..7f688e813 100644 --- a/docs/installing/manual_install.md +++ b/docs/installing/manual_install.md @@ -66,6 +66,12 @@ These are packages that the software depends on: third-party software used to parse documents, host the site, and so on. There are also packages that contain headers necessary to compile some of the gem dependencies in the next step. +
+Note the commands in this section will require root privileges +
+ +### Using other repositories to get more recent packages + Add the following repositories to `/etc/apt/sources.list`: **Debian Squeeze** -- cgit v1.2.3 From c711394fd62947853fdf15f7d4913b31c899c6b7 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 7 Jul 2014 16:45:24 +0100 Subject: Add wheezy repo for squeeze Give better description of what we're getting from each repository and suggest package pinning for wheezy. --- docs/installing/manual_install.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'docs/installing/manual_install.md') diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md index 7f688e813..187ba92e8 100644 --- a/docs/installing/manual_install.md +++ b/docs/installing/manual_install.md @@ -76,12 +76,24 @@ Add the following repositories to `/etc/apt/sources.list`: **Debian Squeeze** - cat > /etc/apt/sources.list.d/debian-backports.list < /etc/apt/sources.list.d/debian-extra.list < /etc/apt/preferences < Date: Mon, 7 Jul 2014 16:46:48 +0100 Subject: Add section for wheezy. --- docs/installing/manual_install.md | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'docs/installing/manual_install.md') diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md index 187ba92e8..3bf241f53 100644 --- a/docs/installing/manual_install.md +++ b/docs/installing/manual_install.md @@ -94,6 +94,17 @@ The squeeze-backports repository is providing a more recent version of rubygems, Pin-Priority: 50 EOF +**Debian Wheezy** + + cat > /etc/apt/sources.list.d/debian-extra.list < Date: Mon, 7 Jul 2014 16:56:05 +0100 Subject: Add raring repository for precise. This allows us to get a more recent version of bundler and pdftk. Also add package pinning instructions. Switch repo as EC2 was giving 403 on some packages. --- docs/installing/manual_install.md | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'docs/installing/manual_install.md') diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md index 3bf241f53..47ed92591 100644 --- a/docs/installing/manual_install.md +++ b/docs/installing/manual_install.md @@ -109,14 +109,31 @@ The squeeze-backports repository is providing a more recent version of rubygems, **Ubuntu Precise** cat > /etc/apt/sources.list.d/ubuntu-extra.list <> /etc/apt/preferences < Date: Mon, 7 Jul 2014 18:07:14 +0100 Subject: 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. --- docs/installing/manual_install.md | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'docs/installing/manual_install.md') 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 <> /etc/apt/preferences < /etc/apt/sources.list.d/mysociety-debian.list <> /etc/apt/preferences < /etc/apt/preferences < Date: Mon, 7 Jul 2014 18:13:13 +0100 Subject: Update instructions on manually installing tricky package dependencies --- docs/installing/manual_install.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docs/installing/manual_install.md') diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md index f5038a46c..b8e559044 100644 --- a/docs/installing/manual_install.md +++ b/docs/installing/manual_install.md @@ -170,6 +170,8 @@ repository - we only want to pull wkhtmltopdf-static from mysociety. No special package pinning is required. +### Other platforms +If you're using some other linux platform, you can optionally install these dependencies manually, as follows: 1. If you would like users to be able to get pretty PDFs as part of the @@ -183,7 +185,9 @@ everything will still work, but users will get ugly, plain text versions of their requests when they download them. 2. Version 1.44 of `pdftk` contains a bug which makes it loop forever in -certain edge conditions. Until it's incorporated into an official release, you +certain edge conditions. This is fixed in the standard 1.44.7 package which is available in wheezy (Debian) and raring (Ubuntu). + +If you can't get an official release for your OS with the fix, you can either hope you don't encounter the bug (it ties up a rails process until you kill it), patch it yourself, or use the Debian package compiled by mySociety (see link in [issue -- cgit v1.2.3 From 266303c2f470d782e236caac487efb322a77c238 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 7 Jul 2014 18:14:01 +0100 Subject: Add wheezy install instructions for the package file --- docs/installing/manual_install.md | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/installing/manual_install.md') diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md index b8e559044..6b1c24534 100644 --- a/docs/installing/manual_install.md +++ b/docs/installing/manual_install.md @@ -201,6 +201,9 @@ Refresh the sources after adding the extra repositories: Now install the packages relevant to your system: + # Debian Wheezy + sudo apt-get install $(cat config/packages.debian-wheezy) + # Debian Squeeze sudo apt-get install $(cat config/packages.debian-squeeze) -- cgit v1.2.3 From 4e77f18c28876ca338dad7fe2d8c06d8725abd81 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 7 Jul 2014 18:14:33 +0100 Subject: We're backporting bundler for Ubuntu. Update the instructions to reflect that. --- docs/installing/manual_install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/installing/manual_install.md') diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md index 6b1c24534..fdb836d37 100644 --- a/docs/installing/manual_install.md +++ b/docs/installing/manual_install.md @@ -217,7 +217,7 @@ choice of packages. ## Install Ruby dependencies To install Alaveteli's Ruby dependencies, you need to install bundler. In -Debian, this is provided as a package (installed as part of the package install +Debian and Ubuntu, this is provided as a package (installed as part of the package install process above). You could also install it as a gem: sudo gem install bundler -- cgit v1.2.3