Просмотр исходного кода

Bump development version to v1.1.2

Kristan Kenney 6 лет назад
Родитель
Сommit
caa9faa3dd

+ 7 - 0
func/upgrade.sh

@@ -154,6 +154,13 @@ upgrade_start_routine() {
 
     # Upgrade to Version 1.1.1
     if [ $VERSION = "1.1.0" ]; then
+        source $HESTIA/install/upgrade/versions/latest.sh
+        VERSION="1.1.1"
+        upgrade_refresh_config
+    fi
+
+    # Upgrade to Version 1.1.2
+    if [ $VERSION = "1.1.1" ]; then
         source $HESTIA/install/upgrade/versions/latest.sh
         VERSION="$new_version"
         upgrade_refresh_config

+ 2 - 2
install/hst-install-debian.sh

@@ -437,7 +437,7 @@ echo ' |  _  |  __/\__ \ |_| | (_| | |___|  __/ '
 echo ' |_| |_|\___||___/\__|_|\__,_|\____|_|    '
 echo
 echo '                      Hestia Control Panel'
-echo '                                    v1.1.1'
+echo '                                    v1.1.2'
 echo -e "\n"
 echo "===================================================================="
 echo -e "\n"
@@ -1075,7 +1075,7 @@ echo "BACKUP_SYSTEM='local'" >> $HESTIA/conf/hestia.conf
 echo "LANGUAGE='$lang'" >> $HESTIA/conf/hestia.conf
 
 # Version & Release Branch
-echo "VERSION='1.1.1'" >> $HESTIA/conf/hestia.conf
+echo "VERSION='1.1.2'" >> $HESTIA/conf/hestia.conf
 echo "RELEASE_BRANCH='release'" >> $HESTIA/conf/hestia.conf
 
 # Installing hosting packages

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

@@ -399,7 +399,7 @@ echo ' |  _  |  __/\__ \ |_| | (_| | |___|  __/ '
 echo ' |_| |_|\___||___/\__|_|\__,_|\____|_|    '
 echo
 echo '                      Hestia Control Panel'
-echo '                                    v1.1.1'
+echo '                                    v1.1.2'
 echo -e "\n"
 echo "===================================================================="
 echo -e "\n"
@@ -1044,7 +1044,7 @@ echo "BACKUP_SYSTEM='local'" >> $HESTIA/conf/hestia.conf
 echo "LANGUAGE='$lang'" >> $HESTIA/conf/hestia.conf
 
 # Version & Release Branch
-echo "VERSION='1.1.1'" >> $HESTIA/conf/hestia.conf
+echo "VERSION='1.1.2'" >> $HESTIA/conf/hestia.conf
 echo "RELEASE_BRANCH='release'" >> $HESTIA/conf/hestia.conf
 
 # Installing hosting packages

+ 1 - 13
install/upgrade/versions/latest.sh

@@ -1,20 +1,8 @@
 #!/bin/sh
 
-# Hestia Control Panel upgrade script for target version 1.1.1
+# Hestia Control Panel upgrade script for target version 1.1.2
 
 #######################################################################################
 #######                      Place additional commands below.                   #######
 #######################################################################################
 
-# Remove 5s delay when sending mail through exim4
-if [ -e "/etc/exim4/exim4.conf.template" ]; then
-    echo "(*) Updating exim4 configuration..."
-    sed -i "s|rfc1413_query_timeout = 5s|rfc1413_query_timeout = 0s|g" /etc/exim4/exim4.conf.template
-fi
-
-# Fix phpMyAdmin blowfish and tmp directory issues
-if [ -e "/usr/share/phpmyadmin/libraries/vendor_config.php" ]; then
-    echo "(*) Updating phpMyAdmin configuration..."
-    sed -i "s|define('CONFIG_DIR', ROOT_PATH);|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
-    sed -i "s|define('TEMP_DIR', ROOT_PATH . 'tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
-fi

+ 20 - 0
install/upgrade/versions/previous/1.1.1.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Hestia Control Panel upgrade script for target version 1.1.1
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################
+
+# Remove 5s delay when sending mail through exim4
+if [ -e "/etc/exim4/exim4.conf.template" ]; then
+    echo "(*) Updating exim4 configuration..."
+    sed -i "s|rfc1413_query_timeout = 5s|rfc1413_query_timeout = 0s|g" /etc/exim4/exim4.conf.template
+fi
+
+# Fix phpMyAdmin blowfish and tmp directory issues
+if [ -e "/usr/share/phpmyadmin/libraries/vendor_config.php" ]; then
+    echo "(*) Updating phpMyAdmin configuration..."
+    sed -i "s|define('CONFIG_DIR', ROOT_PATH);|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
+    sed -i "s|define('TEMP_DIR', ROOT_PATH . 'tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
+fi

+ 1 - 1
src/deb/hestia/control

@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.1.1
+Version: 1.1.2
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com