From 3e9aca9c0795a205b4afe069ddd403889b95ffd2 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Thu, 19 Jun 2014 14:52:20 +0100
Subject: Use the run-with-lockfile shell script instead of the C program

Then re-installers don't have to compile anything.
---
 script/site-specific-install.sh | 1 -
 1 file changed, 1 deletion(-)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index 7d47a5990..fce230822 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -148,7 +148,6 @@ echo -n "Creating /etc/cron.d/alaveteli... "
 sed -r \
     -e "/foi-purge-varnish/d" \
     -e "s,^(MAILTO=).*,\1root@$HOST," \
-    -e "s,run-with-lockfile,$REPOSITORY/commonlib/bin/run-with-lockfile.sh,g" \
     -i /etc/cron.d/alaveteli
 echo $DONE_MSG
 
-- 
cgit v1.2.3


From 91bc1c4963aa8f31d4d708dd87f1a5a4ccb401f1 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Thu, 7 Aug 2014 10:41:52 +0100
Subject: Generate sysvinit with rake task

Now uses ugly so convert it with the rake task
---
 script/site-specific-install.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index fce230822..4c8c99aa2 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -134,10 +134,6 @@ su -l -c "$BIN_DIRECTORY/install-as-user '$UNIX_USER' '$HOST' '$DIRECTORY'" "$UN
 # no longer need the PostgreSQL user to be a superuser:
 echo "ALTER USER \"$UNIX_USER\" WITH NOSUPERUSER;" | su -l -c 'psql' postgres
 
-if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
-    install_sysvinit_script
-fi
-
 # Set up root's crontab:
 
 cd "$REPOSITORY"
@@ -151,6 +147,13 @@ sed -r \
     -i /etc/cron.d/alaveteli
 echo $DONE_MSG
 
+if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
+  echo -n "Creating /etc/init.d/$SITE... "
+  (su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' VCSPATH='$SITE' SITE='$SITE' SCRIPT_FILE=config/sysvinit-thin.ugly" "$UNIX_USER") > /etc/init.d/"$SITE"
+  chmod a+rx /etc/init.d/"$SITE"
+  echo $DONE_MSG
+fi
+
 echo -n "Creating /etc/init.d/foi-alert-tracks... "
 (su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' SCRIPT_FILE=config/alert-tracks-debian.ugly" "$UNIX_USER") > /etc/init.d/foi-alert-tracks
 chmod a+rx /etc/init.d/foi-alert-tracks
-- 
cgit v1.2.3


From 68e509cbef97f5717c6d4e3aad5d93c589f6cdf1 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Fri, 8 Aug 2014 17:22:30 +0100
Subject: Debian specific fixes

- Add wheezy repo to get bundler package which is
  unavailable in squeeze repo
- Get bundler from wheezy repo and de-prioritise all other
  wheezy packages
---
 script/site-specific-install.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index 4c8c99aa2..4b707d0dc 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -30,6 +30,28 @@ misuse() {
 [ -z "$DEVELOPMENT_INSTALL" ] && misuse DEVELOPMENT_INSTALL
 [ -z "$BIN_DIRECTORY" ] && misuse BIN_DIRECTORY
 
+# Debian Squeeze Fixes
+if [ x"$DISTRIBUTION" = x"debian" ] && [ x"$DISTVERSION" = x"squeeze" ]
+then
+  # Add wheezy repo to get bundler
+  cat > /etc/apt/sources.list.d/debian-wheezy.list <<EOF
+deb http://the.earth.li/debian/ wheezy main contrib non-free
+EOF
+
+  # Get bundler from wheezy repo and de-prioritise all other
+  # wheezy packages
+  cat >> /etc/apt/preferences <<EOF
+
+Package: bundler
+Pin: release n=wheezy
+Pin-Priority: 990
+
+Package: *
+Pin: release n=wheezy
+Pin-Priority: 50
+EOF
+fi
+
 update_mysociety_apt_sources
 
 if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
-- 
cgit v1.2.3


From d0df86d597ec95e7b6b7e32af0932563c4c1406f Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Wed, 13 Aug 2014 10:00:45 +0100
Subject: Precise specific fixes

- Get bundler and pdftk from raring repo and de-prioritise all other
  raring packages
---
 script/site-specific-install.sh | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index 4b707d0dc..92809cf85 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -30,6 +30,8 @@ misuse() {
 [ -z "$DEVELOPMENT_INSTALL" ] && misuse DEVELOPMENT_INSTALL
 [ -z "$BIN_DIRECTORY" ] && misuse BIN_DIRECTORY
 
+update_mysociety_apt_sources
+
 # Debian Squeeze Fixes
 if [ x"$DISTRIBUTION" = x"debian" ] && [ x"$DISTVERSION" = x"squeeze" ]
 then
@@ -50,9 +52,39 @@ Package: *
 Pin: release n=wheezy
 Pin-Priority: 50
 EOF
+
+apt-get -qq update
 fi
 
-update_mysociety_apt_sources
+# Ubuntu Precise Fixes
+if [ x"$DISTRIBUTION" = x"ubuntu" ] && [ x"$DISTVERSION" = x"precise" ]
+then
+  cat > /etc/apt/sources.list.d/ubuntu-trusty.list <<EOF
+deb http://archive.ubuntu.com/ubuntu/ trusty universe
+deb-src http://archive.ubuntu.com/ubuntu/ trusty universe
+EOF
+
+  # Get bundler and pdftk from raring and de-prioritise all other
+  # raring packages
+  cat >> /etc/apt/preferences <<EOF
+
+Package: ruby-bundler
+Pin: release n=trusty
+Pin-Priority: 990
+
+Package: pdftk
+Pin: release n=squeeze
+Pin-Priority: 990
+
+Package: *
+Pin: release n=trusty
+Pin-Priority: 50
+EOF
+
+apt-get -qq update
+fi
+
+apt-get -y update
 
 if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
     install_nginx
-- 
cgit v1.2.3


From f81cb5161f91eb40af88e7f5a1871a10e632cdf2 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 15 Aug 2014 15:53:40 +0100
Subject: Use our own Launchpad Ubuntu repo to get pdftk

---
 script/site-specific-install.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index 92809cf85..c113b6efb 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -64,23 +64,28 @@ deb http://archive.ubuntu.com/ubuntu/ trusty universe
 deb-src http://archive.ubuntu.com/ubuntu/ trusty universe
 EOF
 
-  # Get bundler and pdftk from raring and de-prioritise all other
-  # raring packages
+  cat > /etc/apt/sources.list.d/mysociety-launchpad.list <<EOF
+deb http://ppa.launchpad.net/mysociety/alaveteli/ubuntu precise main
+deb-src http://ppa.launchpad.net/mysociety/alaveteli/ubuntu precise main
+EOF
+
+  # Get bundler from trusty and de-prioritise all other
+  # trusty packages
   cat >> /etc/apt/preferences <<EOF
 
 Package: ruby-bundler
 Pin: release n=trusty
 Pin-Priority: 990
 
-Package: pdftk
-Pin: release n=squeeze
-Pin-Priority: 990
-
 Package: *
 Pin: release n=trusty
 Pin-Priority: 50
 EOF
 
+# Get the key for the mysociety ubuntu alaveteli repo
+apt-get install python-software-properties
+add-apt-repository -y ppa:mysociety/alaveteli
+
 apt-get -qq update
 fi
 
-- 
cgit v1.2.3


From f0679b4321f6d1eb3aaca3412d73edde22ce667c Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Mon, 18 Aug 2014 13:27:32 +0100
Subject: Add -y option to install python-software-properties

---
 script/site-specific-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index c113b6efb..5c3fb2339 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -83,7 +83,7 @@ Pin-Priority: 50
 EOF
 
 # Get the key for the mysociety ubuntu alaveteli repo
-apt-get install python-software-properties
+apt-get install -y python-software-properties
 add-apt-repository -y ppa:mysociety/alaveteli
 
 apt-get -qq update
-- 
cgit v1.2.3


From 78166a169df728d4ee4d547a6d870c3463cecf6e Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Tue, 19 Aug 2014 15:18:54 +0100
Subject: Have install script use same init script names as manual install
 docs.

---
 script/site-specific-install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index 5c3fb2339..234154319 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -201,7 +201,7 @@ echo -n "Creating /etc/cron.d/alaveteli... "
 (su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_crontab DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' VCSPATH='$SITE' SITE='$SITE' CRONTAB=config/crontab-example" "$UNIX_USER") > /etc/cron.d/alaveteli
 # There are some other parts to rewrite, so just do them with sed:
 sed -r \
-    -e "/foi-purge-varnish/d" \
+    -e "/$SITE-purge-varnish/d" \
     -e "s,^(MAILTO=).*,\1root@$HOST," \
     -i /etc/cron.d/alaveteli
 echo $DONE_MSG
@@ -213,9 +213,9 @@ if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
   echo $DONE_MSG
 fi
 
-echo -n "Creating /etc/init.d/foi-alert-tracks... "
-(su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' SCRIPT_FILE=config/alert-tracks-debian.ugly" "$UNIX_USER") > /etc/init.d/foi-alert-tracks
-chmod a+rx /etc/init.d/foi-alert-tracks
+echo -n "Creating /etc/init.d/alaveteli-alert-tracks... "
+(su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' SCRIPT_FILE=config/alert-tracks-debian.ugly" "$UNIX_USER") > /etc/init.d/alaveteli-alert-tracks
+chmod a+rx /etc/init.d/alaveteli-alert-tracks
 echo $DONE_MSG
 
 if [ $DEFAULT_SERVER = true ] && [ x != x$EC2_HOSTNAME ]
-- 
cgit v1.2.3


From 8db0f5000d46409a10d9c295c64c6a71e6bd3ea2 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Thu, 21 Aug 2014 15:57:26 +0100
Subject: fixup! Have install script use same init script names as manual
 install docs.

---
 script/site-specific-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index 234154319..0a05b53ec 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -214,7 +214,7 @@ if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
 fi
 
 echo -n "Creating /etc/init.d/alaveteli-alert-tracks... "
-(su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' SCRIPT_FILE=config/alert-tracks-debian.ugly" "$UNIX_USER") > /etc/init.d/alaveteli-alert-tracks
+(su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' SCRIPT_FILE=config/alert-tracks-debian.ugly" "$UNIX_USER") > /etc/init.d/$SITE-alert-tracks
 chmod a+rx /etc/init.d/alaveteli-alert-tracks
 echo $DONE_MSG
 
-- 
cgit v1.2.3


From 7f86642c824acb15222c24f5386c27256a18bc21 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Thu, 21 Aug 2014 16:03:37 +0100
Subject: fixup! Have install script use same init script names as manual
 install docs.

---
 script/site-specific-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index 0a05b53ec..59b714fb7 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -213,9 +213,9 @@ if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
   echo $DONE_MSG
 fi
 
-echo -n "Creating /etc/init.d/alaveteli-alert-tracks... "
+echo -n "Creating /etc/init.d/$SITE-alert-tracks... "
 (su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' SCRIPT_FILE=config/alert-tracks-debian.ugly" "$UNIX_USER") > /etc/init.d/$SITE-alert-tracks
-chmod a+rx /etc/init.d/alaveteli-alert-tracks
+chmod a+rx /etc/init.d/$SITE-alert-tracks
 echo $DONE_MSG
 
 if [ $DEFAULT_SERVER = true ] && [ x != x$EC2_HOSTNAME ]
-- 
cgit v1.2.3