Merge pull request #21 from Keats/master

Fix install of php5-cgi, roundcube SQL directory on Ubuntu 14.04
This commit is contained in:
Joshua Tauberer 2014-04-23 15:00:55 -04:00
commit 48f5421b82
2 changed files with 2 additions and 2 deletions

View File

@ -2,7 +2,7 @@
#################################################
apt-get remove -q -y apache2
apt-get install -q -y nginx
apt-get install -q -y nginx php5-cgi
rm -f /etc/nginx/sites-enabled/default

View File

@ -19,7 +19,7 @@ src_fn=roundcube_0.9.5.orig.tar.gz
src_dir=roundcubemail-0.9.5-dep
wget -nc -P externals http://ftp.debian.org/debian/pool/main/r/roundcube/$src_fn
tar -C /tmp -xzf $(pwd)/externals/$src_fn
if [ ! -d /usr/share/roundcube/SQL ]; then mv /tmp/$src_dir/SQL/ /usr/share/roundcube/; fi
if [ ! -d /var/lib/roundcube/SQL ]; then mv /tmp/$src_dir/SQL/ /var/lib/roundcube/; fi
rm -rf /tmp/$src_dir
# Settings