From d5fe5bd2a2410a23d1cf0001020c303a9d277c80 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Mon, 17 Mar 2014 01:46:47 +0000
Subject: [PATCH] php-fcgid should have been configured in web.sh not
 webmail.sh

When I re-did this, I left in an old reference to the php-fcgid
script that never made it into the repo. Deleting that and moving
the php-fcgid configuration on top of it.

fixes #9
see 2ebd9706ecc8e5fc46e736723749365579c80cee
---
 scripts/web.sh     | 11 +++++++++--
 scripts/webmail.sh |  7 -------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/web.sh b/scripts/web.sh
index 149bf02..9ee69c5 100755
--- a/scripts/web.sh
+++ b/scripts/web.sh
@@ -21,10 +21,17 @@ mkdir -p $STORAGE_ROOT/www/static
 cp conf/www_default.html $STORAGE_ROOT/www/static/index.html
 chown -R $STORAGE_USER $STORAGE_ROOT/www/static/index.html
 
+# Create an init script to start the PHP FastCGI daemon and keep it
+# running after a reboot. Allows us to serve Roundcube for webmail.
+rm -f /etc/init.d/php-fastcgi
+ln -s $(pwd)/conf/phpfcgi-initscript /etc/init.d/php-fastcgi
+update-rc.d php-fastcgi defaults
+
+# Start services.
 service nginx restart
+service php-fastcgi restart
 
-conf/php-fcgid start
-
+# Open ports.
 ufw allow http
 ufw allow https
 
diff --git a/scripts/webmail.sh b/scripts/webmail.sh
index 9fb82e2..8b25894 100755
--- a/scripts/webmail.sh
+++ b/scripts/webmail.sh
@@ -51,10 +51,3 @@ cat - > /etc/roundcube/debian-db.php <<EOF;
 EOF
 chown -R www-data.www-data $STORAGE_ROOT/mail/roundcube
 
-# Create an init script to start the PHP FastCGI daemon and keep it
-# running after a reboot. Use 'restart' to start it here since it may
-# already be running.
-rm -f /etc/init.d/php-fastcgi
-ln -s $(pwd)/conf/phpfcgi-initscript /etc/init.d/php-fastcgi
-update-rc.d php-fastcgi defaults
-service php-fastcgi restart