Merge branch 'hotfix/upgrade-scripts' into develop

Author: Kristan Kenney

install/upgrade/0.9.8-28.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+function welcome_message() {
+    echo
+    echo '     _   _           _   _        ____ ____        '
+    echo '    | | | | ___  ___| |_(_) __ _ / ___|  _ \       '
+    echo '    | |_| |/ _ \/ __| __| |/ _` | |   | |_) |      '
+    echo '    |  _  |  __/\__ \ |_| | (_| | |___|  __/       '
+    echo '    |_| |_|\___||___/\__|_|\__,_|\____|_|          '
+    echo ""
+    echo "       Hestia Control Panel Upgrade Script"
+    echo "             Version: $version                     "
+    echo "==================================================="
+    echo ""
+    echo "Existing files will be backed up to the following location:"
+    echo "$HESTIA_BACKUP/"
+    echo ""
+    echo "This process may take a few moments, please wait..."
+    echo ""
+}
+
+function upgrade_complete() {
+    echo ""
+    echo "    Upgrade complete! Please report any bugs or issues to"
+    echo "    https://github.com/hestiacp/hestiacp/issues"
+    echo ""
+    echo "    We hope that you enjoy this release of Hestia Control Panel,"
+    echo "    enjoy your day!"
+    echo ""
+    echo "    Sincerely,"
+    echo "    The Hestia Control Panel development team"
+    echo ""
+    echo "    www.hestiacp.com"
+    echo "    Made with love & pride by the open-source community around the world."
+    echo ""
+    echo ""
+}

install/upgrade/1.00.0-190621.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Define version check function
+function version_ge(){ test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" -o ! -z "$1" -a "$1" = "$2"; }
+
+# Set phpMyAdmin version for upgrade
+pma_v='4.9.0.1'
+
+pma_release_file=$(ls /usr/share/phpmyadmin/RELEASE-DATE-* 2>/dev/null |tail -n 1)
+if version_ge "${pma_release_file##*-}" "$pma_v"; then
+    echo "(*) phpMyAdmin $pma_v or newer is already installed: ${pma_release_file##*-}, skipping update..."
+else
+    # Display upgrade information
+    echo "(*) Upgrade phpMyAdmin to v$pma_v..."
+    [ -d /usr/share/phpmyadmin ] || mkdir -p /usr/share/phpmyadmin
+
+    # Download latest phpMyAdmin release
+    wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
+ 
+    # Unpack files
+    tar xzf phpMyAdmin-$pma_v-all-languages.tar.gz
+
+    # Delete file to prevent error
+    rm -fr /usr/share/phpmyadmin/doc/html
+
+    # Overwrite old files
+    cp -rf phpMyAdmin-$pma_v-all-languages/* /usr/share/phpmyadmin
+
+    # Set config and log directory
+    sed -i "s|define('CONFIG_DIR', '');|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
+    sed -i "s|define('TEMP_DIR', './tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
+
+    # Create temporary folder and change permissions
+    if [ ! -d /usr/share/phpmyadmin/tmp ]; then
+        mkdir /usr/share/phpmyadmin/tmp
+        chmod 777 /usr/share/phpmyadmin/tmp
+    fi
+
+    # Clean up source files
+    rm -fr phpMyAdmin-$pma_v-all-languages
+    rm -f phpMyAdmin-$pma_v-all-languages.tar.gz
+fi

install/upgrade/messages.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+echo "(*) Restarting services..."
+sleep 3
+if [ ! -z $MAIL_SYSTEM ]; then
+	$BIN/v-restart-mail $restart
+fi
+if [ ! -z $IMAP_SYSTEM ]; then
+	$BIN/v-restart-service $IMAP_SYSTEM $restart
+fi
+if [ ! -z $WEB_SYSTEM ]; then
+	$BIN/v-restart-web $restart
+	$BIN/v-restart-proxy $restart
+fi
+if [ ! -z $DNS_SYSTEM ]; then
+	$BIN/v-restart-dns $restart
+fi
+
+# Restart SSH daemon and Hestia Control Panel service
+$BIN/v-restart-service ssh $restart
+$BIN/v-restart-service hestia $restart

install/upgrade/phpmyadmin.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ $VERSION = "$version" ]; then
+    echo "(!) The latest version of Hestia Control Panel ($version) is already installed."
+    echo "    Verifying configuration..."
+    echo ""
+    source /usr/local/hestia/install/upgrade/versions/$version.sh
+    VERSION="$version"
+fi
+if [ $VERSION = "0.9.8-27" ]; then
+    source /usr/local/hestia/install/upgrade/versions/0.9.8-28.sh
+    VERSION="0.9.8-28"
+fi
+if [ $VERSION = "0.9.8-28" ]; then
+    source /usr/local/hestia/install/upgrade/versions/1.00.0-190618.sh
+    VERSION="1.00.0-190618"
+fi
+if [ $VERSION = "0.10.00" ] || [ $VERSION = "1.00.0-190618" ]; then
+    source /usr/local/hestia/install/upgrade/versions/$version.sh
+    VERSION="$version"
+fi

install/upgrade/restart.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+HESTIA="/usr/local/hestia"
+HESTIA_BACKUP="/root/hst_upgrade/$(date +%d%m%Y%H%M)"
+spinner="/-\|"
+
+function version_ge(){ test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" -o ! -z "$1" -a "$1" = "$2"; }
+
+# Add amd64 to repositories to prevent notifications - https://goo.gl/hmsSV7
+if ! grep -q 'arch=amd64' /etc/apt/sources.list.d/nginx.list; then
+    sed -i s/"deb "/"deb [arch=amd64] "/g /etc/apt/sources.list.d/nginx.list
+fi
+if ! grep -q 'arch=amd64' /etc/apt/sources.list.d/mariadb.list; then
+    sed -i s/"deb "/"deb [arch=amd64] "/g /etc/apt/sources.list.d/mariadb.list
+fi
+
+# Fix named rule for AppArmor - https://goo.gl/SPqHdq
+if [ "$DNS_SYSTEM" = 'bind9' ] && [ ! -f /etc/apparmor.d/local/usr.sbin.named ]; then
+        echo "/home/** rwm," >> /etc/apparmor.d/local/usr.sbin.named 2> /dev/null
+fi
+
+# Remove obsolete ports.conf if exists.
+if [ -f /usr/local/hestia/data/firewall/ports.conf ]; then
+    rm -f /usr/local/hestia/data/firewall/ports.conf
+fi
+
+# Reset backend port
+if [ ! -z "$BACKEND_PORT" ]; then
+    /usr/local/hestia/bin/v-change-sys-port $BACKEND_PORT
+fi
+
+# Move clamav to proper location - https://goo.gl/zNuM11
+if [ ! -d /usr/local/hestia/web/edit/server/clamav-daemon ]; then
+    mv /usr/local/hestia/web/edit/server/clamd /usr/local/web/edit/server/clamav-daemon
+fi