external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-04 15:54:48 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into owncloud (php5-fpm)

Browse Source
This commit is contained in:
Joshua Tauberer
2014-08-12 13:30:55 +00:00
parent 791e68a3af 0eceb2012f
commit c9bf57eacd
5 changed files with 25 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
setup/web.sh
View File

@@ -5,7 +5,7 @@
source setup/functions.sh # load our functions
source /etc/mailinabox.conf # load global vars
apt_install nginx php5-cgi
apt_install nginx php5-fpm
rm -f /etc/nginx/sites-enabled/default
@@ -30,11 +30,14 @@ if [ ! -f $STORAGE_ROOT/www/default/index.html ]; then
fi
chown -R $STORAGE_USER $STORAGE_ROOT/www
# 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
hide_output update-rc.d php-fastcgi defaults
# We previously installed a custom init script to start the PHP FastCGI daemon.
# Remove it now that we're using php5-fpm.
if [ -L /etc/init.d/php-fastcgi ]; then
echo "Removing /etc/init.d/php-fastcgi, php5-cgi..."
rm -f /etc/init.d/php-fastcgi
hide_output update-rc.d php-fastcgi remove
apt-get -y purge php5-cgi
fi
# Put our webfinger and Exchange autodiscover.xml server scripts
# into a well-known location.