From d7731405024dcea0c69542aa41a739c0cd68db49 Mon Sep 17 00:00:00 2001 From: yodax Date: Mon, 10 Jul 2017 22:56:59 +0200 Subject: [PATCH] Update to Nextcloud 12 using PHP7 * Install PHP7 via a PPA, enable unattended upgrades for the PPA, and switch all of our PHP configuration to the PHP7 install. * Keep installing PHP5 for ownCloud/Nextcloud packages because we need it to possibly run transitional updates to ownCloud/Nextcloud versions less than 12. But replace PHP5 packages with PHP7 packages elsewhere. * Update to Nextcloud 12 which requires PHP7, with a transitional upgrade to Nextcloud 11.0.3. * Disable TLS cert validation by Roundcube when connecting to localhost IMAP and SMTP. Validation became the default in PHP7 but we don't necessarily have a (non-self-)signed certificate and it definitely isn't valid for the IP address 127.0.0.1. Merges #1140 --- CHANGELOG.md | 4 + conf/nginx-top.conf | 2 +- setup/functions.sh | 9 +++ setup/owncloud.sh | 159 +++++++++++++++++++++++++++----------- setup/system.sh | 11 +++ setup/web.sh | 14 ++-- setup/webmail.sh | 22 +++++- setup/zpush.sh | 6 +- tools/owncloud-restore.sh | 2 + 9 files changed, 173 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8988a22c..4a2cdc27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ Mail: * Updated to [Roundcube 1.3](https://roundcube.net/news/2017/06/26/roundcube-webmail-1.3.0-released), but unfortunately dropping the Vacation plugin because it has not been supported by its author and is not compatible with Roundcube 1.3. * Updated to [Z-Push 2.3.7](http://download.z-push.org/final/2.3/z-push-2.3.7.txt). +Nextcloud: + +* Nextcloud updated to 12.0.0. + v0.23a (May 31, 2017) --------------------- diff --git a/conf/nginx-top.conf b/conf/nginx-top.conf index 6be9b414..a5822a82 100644 --- a/conf/nginx-top.conf +++ b/conf/nginx-top.conf @@ -7,6 +7,6 @@ ## your own --- please do not ask for help from us. upstream php-fpm { - server unix:/var/run/php5-fpm.sock; + server unix:/var/run/php/php7.0-fpm.sock; } diff --git a/setup/functions.sh b/setup/functions.sh index 947aa5ab..00cc4d90 100644 --- a/setup/functions.sh +++ b/setup/functions.sh @@ -48,6 +48,15 @@ function apt_install { apt_get_quiet install $PACKAGES } +function apt_add_repository_to_unattended_upgrades { + if [ -f /etc/apt/apt.conf.d/50unattended-upgrades ]; then + if ! grep -q "$1" /etc/apt/apt.conf.d/50unattended-upgrades; then + sed -i "/Allowed-Origins/a \ + \"$1\";" /etc/apt/apt.conf.d/50unattended-upgrades + fi + fi +} + function get_default_hostname { # Guess the machine's hostname. It should be a fully qualified # domain name suitable for DNS. None of these calls may provide diff --git a/setup/owncloud.sh b/setup/owncloud.sh index aba505a1..8602af08 100755 --- a/setup/owncloud.sh +++ b/setup/owncloud.sh @@ -9,6 +9,7 @@ source /etc/mailinabox.conf # load global vars echo "Installing Nextcloud (contacts/calendar)..." +# Keep the php5 dependancies for the owncloud upgrades apt_install \ dbconfig-common \ php5-cli php5-sqlite php5-gd php5-imap php5-curl php-pear php-apc curl libapr1 libtool libcurl4-openssl-dev php-xml-parser \ @@ -16,6 +17,10 @@ apt_install \ apt-get purge -qq -y owncloud* +apt_install php7.0 php7.0-fpm \ + php7.0-cli php7.0-sqlite php7.0-gd php7.0-imap php7.0-curl php-pear php-apc curl \ + php7.0-dev php7.0-gd memcached php7.0-memcached php7.0-xml php7.0-mbstring php7.0-zip php7.0-apcu + # Migrate <= v0.10 setups that stored the ownCloud config.php in /usr/local rather than # in STORAGE_ROOT. Move the file to STORAGE_ROOT. if [ ! -f $STORAGE_ROOT/owncloud/config.php ] \ @@ -28,52 +33,35 @@ if [ ! -f $STORAGE_ROOT/owncloud/config.php ] \ ln -sf $STORAGE_ROOT/owncloud/config.php /usr/local/lib/owncloud/config/config.php fi -InstallOwncloud() { +InstallNextcloud() { version=$1 hash=$2 - flavor=$3 echo - echo "Upgrading to $flavor version $version" + echo "Upgrading to Nextcloud version $version" echo # Remove the current owncloud/Nextcloud rm -rf /usr/local/lib/owncloud # Download and verify - if [ "$flavor" = "Nextcloud" ]; then - wget_verify https://download.nextcloud.com/server/releases/nextcloud-$version.zip $hash /tmp/owncloud.zip - else - wget_verify https://download.owncloud.org/community/owncloud-$version.zip $hash /tmp/owncloud.zip - fi + wget_verify https://download.nextcloud.com/server/releases/nextcloud-$version.zip $hash /tmp/nextcloud.zip # Extract ownCloud/Nextcloud - unzip -q /tmp/owncloud.zip -d /usr/local/lib - if [ "$flavor" = "Nextcloud" ]; then - mv /usr/local/lib/nextcloud /usr/local/lib/owncloud - fi - rm -f /tmp/owncloud.zip + unzip -q /tmp/nextcloud.zip -d /usr/local/lib + mv /usr/local/lib/nextcloud /usr/local/lib/owncloud + rm -f /tmp/nextcloud.zip # The two apps we actually want are not in Nextcloud core. Download the releases from # their github repositories. mkdir -p /usr/local/lib/owncloud/apps - if [ "$flavor" = "Nextcloud" ]; then - wget_verify https://github.com/nextcloud/contacts/releases/download/v1.5.3/contacts.tar.gz 78c4d49e73f335084feecd4853bd8234cf32615e /tmp/contacts.tgz - else - wget_verify https://github.com/owncloud/contacts/releases/download/v1.4.0.0/contacts.tar.gz c1c22d29699456a45db447281682e8bc3f10e3e7 /tmp/contacts.tgz - fi - + wget_verify https://github.com/nextcloud/contacts/releases/download/v1.5.3/contacts.tar.gz 78c4d49e73f335084feecd4853bd8234cf32615e /tmp/contacts.tgz tar xf /tmp/contacts.tgz -C /usr/local/lib/owncloud/apps/ rm /tmp/contacts.tgz - if [ "$flavor" = "Nextcloud" ]; then - wget_verify https://github.com/nextcloud/calendar/releases/download/v1.5.2/calendar.tar.gz 7b8a94e01fe740c5c23017ed5bc211983c780fce /tmp/calendar.tgz - else - wget_verify https://github.com/nextcloud/calendar/releases/download/v1.4.0/calendar.tar.gz c84f3170efca2a99ea6254de34b0af3cb0b3a821 /tmp/calendar.tgz - fi - + wget_verify https://github.com/nextcloud/calendar/releases/download/v1.5.3/calendar.tar.gz b370352d1f280805cc7128f78af4615f623827f8 /tmp/calendar.tgz tar xf /tmp/calendar.tgz -C /usr/local/lib/owncloud/apps/ rm /tmp/calendar.tgz @@ -105,15 +93,76 @@ InstallOwncloud() { fi } -owncloud_ver=10.0.5 -owncloud_hash=686f6a8e9d7867c32e3bf3ca63b3cc2020564bf6 -owncloud_flavor=Nextcloud +# We only install ownCloud intermediate versions to be able to seemlesly upgrade to Nextcloud +InstallOwncloud() { + + version=$1 + hash=$2 + + echo + echo "Upgrading to OwnCloud version $version" + echo + + # Remove the current owncloud/Nextcloud + rm -rf /usr/local/lib/owncloud + + # Download and verify + wget_verify https://download.owncloud.org/community/owncloud-$version.zip $hash /tmp/owncloud.zip + + + # Extract ownCloud + unzip -q /tmp/owncloud.zip -d /usr/local/lib + rm -f /tmp/owncloud.zip + + # The two apps we actually want are not in Nextcloud core. Download the releases from + # their github repositories. + mkdir -p /usr/local/lib/owncloud/apps + + wget_verify https://github.com/owncloud/contacts/releases/download/v1.4.0.0/contacts.tar.gz c1c22d29699456a45db447281682e8bc3f10e3e7 /tmp/contacts.tgz + tar xf /tmp/contacts.tgz -C /usr/local/lib/owncloud/apps/ + rm /tmp/contacts.tgz + + wget_verify https://github.com/nextcloud/calendar/releases/download/v1.4.0/calendar.tar.gz c84f3170efca2a99ea6254de34b0af3cb0b3a821 /tmp/calendar.tgz + tar xf /tmp/calendar.tgz -C /usr/local/lib/owncloud/apps/ + rm /tmp/calendar.tgz + + # Fix weird permissions. + chmod 750 /usr/local/lib/owncloud/{apps,config} + + # Create a symlink to the config.php in STORAGE_ROOT (for upgrades we're restoring the symlink we previously + # put in, and in new installs we're creating a symlink and will create the actual config later). + ln -sf $STORAGE_ROOT/owncloud/config.php /usr/local/lib/owncloud/config/config.php + + # Make sure permissions are correct or the upgrade step won't run. + # $STORAGE_ROOT/owncloud may not yet exist, so use -f to suppress + # that error. + chown -f -R www-data.www-data $STORAGE_ROOT/owncloud /usr/local/lib/owncloud + + # If this isn't a new installation, immediately run the upgrade script. + # Then check for success (0=ok and 3=no upgrade needed, both are success). + if [ -e $STORAGE_ROOT/owncloud/owncloud.db ]; then + # ownCloud 8.1.1 broke upgrades. It may fail on the first attempt, but + # that can be OK. + sudo -u www-data php5 /usr/local/lib/owncloud/occ upgrade + if [ \( $? -ne 0 \) -a \( $? -ne 3 \) ]; then + echo "Trying ownCloud upgrade again to work around ownCloud upgrade bug..." + sudo -u www-data php5 /usr/local/lib/owncloud/occ upgrade + if [ \( $? -ne 0 \) -a \( $? -ne 3 \) ]; then exit 1; fi + sudo -u www-data php5 /usr/local/lib/owncloud/occ maintenance:mode --off + echo "...which seemed to work." + fi + fi +} + +owncloud_ver=12.0.0 +owncloud_hash=5d64307d9ce513a8905514b2fbe212f563fe76df # Check if Nextcloud dir exist, and check if version matches owncloud_ver (if either doesn't - install/upgrade) if [ ! -d /usr/local/lib/owncloud/ ] \ || ! grep -q $owncloud_ver /usr/local/lib/owncloud/version.php; then # Stop php-fpm + hide_output service php7.0-fpm stop hide_output service php5-fpm stop # Backup the existing ownCloud/Nextcloud. @@ -135,7 +184,7 @@ if [ ! -d /usr/local/lib/owncloud/ ] \ if [ -e /usr/local/lib/owncloud/version.php ]; then if grep -q "8\.1\.[0-9]" /usr/local/lib/owncloud/version.php; then echo "We are running 8.1.x, upgrading to 8.2.3 first" - InstallOwncloud 8.2.3 bfdf6166fbf6fc5438dc358600e7239d1c970613 ownCloud + InstallOwncloud 8.2.3 bfdf6166fbf6fc5438dc358600e7239d1c970613 fi # If we are upgrading from 8.2.x we should go to 9.0 first. Owncloud doesn't support skipping minor versions @@ -149,7 +198,7 @@ if [ ! -d /usr/local/lib/owncloud/ ] \ array('{127.0.0.1:993/imap/ssl/novalidate-cert}') ) ), - 'memcache.local' => '\OC\Memcache\APC', + 'memcache.local' => '\OC\Memcache\APCu', 'mail_smtpmode' => 'sendmail', 'mail_smtpsecure' => '', 'mail_smtpauthtype' => 'LOGIN', @@ -272,7 +332,7 @@ include("$STORAGE_ROOT/owncloud/config.php"); \$CONFIG['trusted_domains'] = array('$PRIMARY_HOSTNAME'); -\$CONFIG['memcache.local'] = '\OC\Memcache\APC'; +\$CONFIG['memcache.local'] = '\OC\Memcache\APCu'; \$CONFIG['overwrite.cli.url'] = '/cloud'; \$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches our master administrator address @@ -305,7 +365,7 @@ if [ \( $? -ne 0 \) -a \( $? -ne 3 \) ]; then exit 1; fi # Set PHP FPM values to support large file uploads # (semicolon is the comment character in this file, hashes produce deprecation warnings) -tools/editconf.py /etc/php5/fpm/php.ini -c ';' \ +tools/editconf.py /etc/php/7.0/fpm/php.ini -c ';' \ upload_max_filesize=16G \ post_max_size=16G \ output_buffering=16384 \ @@ -313,9 +373,23 @@ tools/editconf.py /etc/php5/fpm/php.ini -c ';' \ max_execution_time=600 \ short_open_tag=On +# Set Nextcloud recommended opcache settings +tools/editconf.py /etc/php/7.0/cli/conf.d/10-opcache.ini -c ';' \ + opcache.enable=1 \ + opcache.enable_cli=1 \ + opcache.interned_strings_buffer=8 \ + opcache.max_accelerated_files=10000 \ + opcache.memory_consumption=128 \ + opcache.save_comments=1 \ + opcache.revalidate_freq=1 + +# Configure the path environment for php-fpm +tools/editconf.py /etc/php/7.0/fpm/pool.d/www.conf -c ';' \ + env[PATH]=/usr/local/bin:/usr/bin:/bin + # If apc is explicitly disabled we need to enable it -if grep -q apc.enabled=0 /etc/php5/mods-available/apcu.ini; then - tools/editconf.py /etc/php5/mods-available/apcu.ini -c ';' \ +if grep -q apc.enabled=0 /etc/php/7.0/mods-available/apcu.ini; then + tools/editconf.py /etc/php/7.0/mods-available/apcu.ini -c ';' \ apc.enabled=1 fi @@ -337,5 +411,4 @@ chmod +x /etc/cron.hourly/mailinabox-owncloud # ``` # Enable PHP modules and restart PHP. -php5enmod imap -restart_service php5-fpm +restart_service php7.0-fpm diff --git a/setup/system.sh b/setup/system.sh index c0af3215..791f2776 100755 --- a/setup/system.sh +++ b/setup/system.sh @@ -119,6 +119,17 @@ apt_install python3 python3-dev python3-pip \ haveged pollinate unzip \ unattended-upgrades cron ntp fail2ban +# ### Add PHP7 PPA + +# Nextcloud requires PHP7, we will install the ppa from ubuntu php maintainer Ondřej Surý +# The PPA is located here https://launchpad.net/%7Eondrej/+archive/ubuntu/php +# Unattended upgrades are activated for the repository + +hide_output add-apt-repository -y ppa:ondrej/php +apt_add_repository_to_unattended_upgrades LP-PPA-ondrej-php:trusty +hide_output apt-get update + + # ### Suppress Upgrade Prompts # Since Mail-in-a-Box might jump straight to 18.04 LTS, there's no need # to be reminded about 16.04 on every login. diff --git a/setup/web.sh b/setup/web.sh index 6a412b98..0d94fcfd 100755 --- a/setup/web.sh +++ b/setup/web.sh @@ -18,7 +18,11 @@ fi # Turn off nginx's default website. echo "Installing Nginx (web server)..." -apt_install nginx php5-fpm + +apt_install nginx php7.0-cli php7.0-fpm + +# Set PHP7 as the default +update-alternatives --set php /usr/bin/php7.0 rm -f /etc/nginx/sites-enabled/default @@ -40,15 +44,15 @@ tools/editconf.py /etc/nginx/nginx.conf -s \ server_names_hash_bucket_size="128;" # Tell PHP not to expose its version number in the X-Powered-By header. -tools/editconf.py /etc/php5/fpm/php.ini -c ';' \ +tools/editconf.py /etc/php/7.0/fpm/php.ini -c ';' \ expose_php=Off # Set PHPs default charset to UTF-8, since we use it. See #367. -tools/editconf.py /etc/php5/fpm/php.ini -c ';' \ +tools/editconf.py /etc/php/7.0/fpm/php.ini -c ';' \ default_charset="UTF-8" # Bump up PHP's max_children to support more concurrent connections -tools/editconf.py /etc/php5/fpm/pool.d/www.conf -c ';' \ +tools/editconf.py /etc/php/7.0/fpm/pool.d/www.conf -c ';' \ pm.max_children=8 # Other nginx settings will be configured by the management service @@ -103,7 +107,7 @@ done #NODOC # Start services. restart_service nginx -restart_service php5-fpm +restart_service php7.0-fpm # Open ports. ufw_allow http diff --git a/setup/webmail.sh b/setup/webmail.sh index 628fbb7f..67070ec2 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -22,8 +22,10 @@ source /etc/mailinabox.conf # load global vars echo "Installing Roundcube (webmail)..." apt_install \ dbconfig-common \ - php5 php5-sqlite php5-mcrypt php5-intl php5-json php5-common php-auth php-net-smtp php-net-socket php-net-sieve php-mail-mime php-crypt-gpg php5-gd php5-pspell \ - tinymce libjs-jquery libjs-jquery-mousewheel libmagic1 + php7.0-cli php7.0-sqlite php7.0-mcrypt php7.0-intl php7.0-json php7.0-common \ + php-auth php-net-smtp php-net-socket php-net-sieve php-mail-mime php-crypt-gpg \ + php7.0-gd php7.0-pspell tinymce libjs-jquery libjs-jquery-mousewheel libmagic1 + apt_get_quiet remove php-mail-mimedecode # no longer needed since Roundcube 1.1.3 # We used to install Roundcube from Ubuntu, without triggering the dependencies #NODOC @@ -108,11 +110,23 @@ cat > $RCM_CONFIG < array( + 'verify_peer' => false, + 'verify_peer_name' => false, + ), + ); \$config['imap_timeout'] = 15; \$config['smtp_server'] = 'tls://127.0.0.1'; \$config['smtp_port'] = 587; \$config['smtp_user'] = '%u'; \$config['smtp_pass'] = '%p'; +\$config['smtp_conn_options'] = array( + 'ssl' => array( + 'verify_peer' => false, + 'verify_peer_name' => false, + ), + ); \$config['support_url'] = 'https://mailinabox.email/'; \$config['product_name'] = '$PRIMARY_HOSTNAME Webmail'; \$config['des_key'] = '$SECRET_KEY'; @@ -186,5 +200,5 @@ chown www-data:www-data $STORAGE_ROOT/mail/roundcube/roundcube.sqlite chmod 664 $STORAGE_ROOT/mail/roundcube/roundcube.sqlite # Enable PHP modules. -php5enmod mcrypt -restart_service php5-fpm +phpenmod -v php7.0 mcrypt imap +restart_service php7.0-fpm diff --git a/setup/zpush.sh b/setup/zpush.sh index 5507bc4d..d5675baf 100755 --- a/setup/zpush.sh +++ b/setup/zpush.sh @@ -17,9 +17,9 @@ source /etc/mailinabox.conf # load global vars echo "Installing Z-Push (Exchange/ActiveSync server)..." apt_install \ - php-soap php5-imap libawl-php php5-xsl + php7.0-soap php7.0-imap libawl-php php7.0-xsl -php5enmod imap +phpenmod -v php7.0 imap # Copy Z-Push into place. TARGETHASH=01cdfafcdf6855f566a9cbc5826b3d9930a9b35b @@ -100,7 +100,7 @@ EOF # Restart service. -restart_service php5-fpm +restart_service php7.0-fpm # Fix states after upgrade diff --git a/tools/owncloud-restore.sh b/tools/owncloud-restore.sh index 4d647b10..1b006ca1 100755 --- a/tools/owncloud-restore.sh +++ b/tools/owncloud-restore.sh @@ -27,6 +27,7 @@ fi echo "Restoring backup from $1" service php5-fpm stop +service php7.0-fpm stop # remove the current ownCloud/Nextcloud installation rm -rf /usr/local/lib/owncloud/ @@ -46,4 +47,5 @@ chown www-data.www-data $STORAGE_ROOT/owncloud/config.php sudo -u www-data php /usr/local/lib/owncloud/occ maintenance:mode --off service php5-fpm start +service php7.0-fpm start echo "Done"