1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-27 19:37:22 +01:00

Merge branch 'owncloud' of github.com:jkaberg/mailinabox into owncloud

Conflicts:
	conf/nginx.conf
	setup/zpush.sh
This commit is contained in:
Joshua Tauberer
2014-08-12 23:10:51 +00:00
4 changed files with 33 additions and 8 deletions

View File

@@ -14,7 +14,7 @@ source /etc/mailinabox.conf # load global vars
# Prereqs.
apt_install \
php-soap php5-imap libawl-php
php-soap php5-imap libawl-php php5-xsl
php5enmod imap
@@ -29,7 +29,7 @@ fi
if [ $needs_update == 1 ]; then
rm -rf /usr/local/lib/z-push
rm -f /tmp/zpush.zip
echo Installing z-push \(fmbiete fork\)...
echo installing z-push \(fmbiete fork\)...
wget -qO /tmp/zpush.zip https://github.com/fmbiete/Z-Push-contrib/archive/master.zip
unzip -q /tmp/zpush.zip -d /usr/local/lib/
mv /usr/local/lib/Z-Push-contrib-master /usr/local/lib/z-push