aboutsummaryrefslogtreecommitdiffstats
path: root/script/site-specific-install.sh
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-08-08 16:19:49 +0100
committerLouise Crow <louise.crow@gmail.com>2014-08-08 16:19:49 +0100
commita760114de869ce3f07358dde19b8b5cc5d36003b (patch)
treec55b0b5037bc42cbc6b4a65cbb7d8b048c056efd /script/site-specific-install.sh
parentc3e1825ffbdd86f477491447972ff24416d8ba96 (diff)
parentd700f325de56c8a039cbe4178dd44842ef0ee977 (diff)
Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
Diffstat (limited to 'script/site-specific-install.sh')
-rwxr-xr-xscript/site-specific-install.sh11
1 files changed, 7 insertions, 4 deletions
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