浏览代码

Merge pull request #333 from hestiacp/apps-update

Applications Version Bump
Raphael Schneeberger 6 年之前
父节点
当前提交
6bbc5bc430
共有 3 个文件被更改,包括 37 次插入4 次删除
  1. 1 1
      install/hst-install-ubuntu.sh
  2. 34 1
      install/upgrade/0.10.0-190430.sh
  3. 2 2
      src/hst_autocompile.sh

+ 1 - 1
install/hst-install-ubuntu.sh

@@ -22,7 +22,7 @@ codename="$(lsb_release -s -c)"
 hestiacp="$HESTIA/install/deb"
 
 # Define software versions
-pma_v='4.8.5'
+pma_v='4.9.0.1'
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3")
 fpm_v="7.3"
 

+ 34 - 1
install/upgrade/0.10.0-190430.sh

@@ -4,6 +4,7 @@
 HESTIA="/usr/local/hestia"
 HESTIA_BACKUP="/root/hst_upgrade/$(date +%d%m%Y%H%M)"
 hestiacp="$HESTIA/install/deb"
+pma_v='4.9.0.1'
 
 # Add webmail alias variable to system configuration if non-existent
 WEBMAIL_ALIAS_CHECK=$(cat $HESTIA/conf/hestia.conf | grep WEBMAIL_ALIAS)
@@ -181,7 +182,7 @@ if [ ! -e '/usr/bin/setfacl' ]; then
     mv /var/lib/dpkg/updates/ /var/lib/dpkg/updates.bak/
     mkdir -p /var/lib/dpkg/updates/
 
-	# Install missing acl package
+    # Install missing acl package
     apt-get -qq update > /dev/null 2>&1
     apt-get -qq -y install acl > /dev/null 2>&1
 
@@ -374,6 +375,38 @@ for user in `ls /usr/local/hestia/data/users/`; do
 	fi
 done
 
+# Upgrade phpMyAdmin
+if [ "$DB_SYSTEM" = 'mysql' ]; then
+    # Display upgrade information
+    echo "(*) Upgrade phpMyAdmin to v$pma_v..."
+
+    # 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
+
+    # Clear up
+    rm -fr phpMyAdmin-$pma_v-all-languages
+    rm -f phpMyAdmin-$pma_v-all-languages.tar.gz
+fi
+
 # Add upgrade notification to admin user's panel
 $BIN/v-add-user-notification admin 'Upgrade complete' 'Your server has been updated to v0.10.0.<br>Please report any bugs on GitHub at<br>https://github.com/hestiacp/hestiacp/Issues<br><br>Have a great day!'
 

+ 2 - 2
src/hst_autocompile.sh

@@ -66,11 +66,11 @@ ARCHIVE_DIR="$SRC_DIR/src/archive/"
 
 # Set Version for compiling
 HESTIA_V='0.10.0-190430_amd64'
-NGINX_V='1.16.0'
+NGINX_V='1.17.0'
 OPENSSL_V='1.1.1b'
 PCRE_V='8.43'
 ZLIB_V='1.2.11'
-PHP_V='7.3.5'
+PHP_V='7.3.6'
 
 # Create build directories
 rm -rf $BUILD_DIR