Prechádzať zdrojové kódy

Fixes to how variables are set during upgrades

Kristan Kenney 6 rokov pred
rodič
commit
c7701b6b4b

+ 2 - 2
install/upgrade/versions/latest.sh

@@ -61,7 +61,7 @@ if [ ! -z "$WEBALIZER_CHECK" ]; then
     if [ -d "/var/www/webalizer" ]; then
     if [ -d "/var/www/webalizer" ]; then
         rm -rf /var/www/webalizer
         rm -rf /var/www/webalizer
     fi
     fi
-    sed -i "s/STATS_SYSTEM='webalizer,awstats'/STATS_SYSTEM='awstats'/g" $HESTIA/conf/hestia.conf
+    $HESTIA/bin/v-change-sys-config-value 'STATS_SYSTEM' 'awstats'
 fi
 fi
 
 
 # Remove old hestia.conf files from Apache & NGINX if they exist
 # Remove old hestia.conf files from Apache & NGINX if they exist
@@ -83,6 +83,6 @@ fi
 
 
 # Update webmail templates to enable OCSP/SSL stapling
 # Update webmail templates to enable OCSP/SSL stapling
 if [ ! -z "$IMAP_SYSTEM" ]; then
 if [ ! -z "$IMAP_SYSTEM" ]; then
-    echo "(*) Enabling OCSP stapling support for webmail services..."
+    echo "(*) Improving SSL security of Roundcube webmail..."
     $BIN/v-update-mail-templates > /dev/null 2>&1
     $BIN/v-update-mail-templates > /dev/null 2>&1
 fi 
 fi 

+ 1 - 2
install/upgrade/versions/previous/1.0.1.sh

@@ -9,8 +9,7 @@
 # Ensure that users from previous releases are set to the correct stable release branch
 # Ensure that users from previous releases are set to the correct stable release branch
 if [ ! -z "$RELEASE_BRANCH" ] && [ "$RELEASE_BRANCH" = "master" ] || [ "$RELEASE_BRANCH" = "develop" ]; then
 if [ ! -z "$RELEASE_BRANCH" ] && [ "$RELEASE_BRANCH" = "master" ] || [ "$RELEASE_BRANCH" = "develop" ]; then
     echo "(*) Updating default release branch configuration..."
     echo "(*) Updating default release branch configuration..."
-    sed -i "/RELEASE_BRANCH/d" $HESTIA/conf/hestia.conf
-    echo "RELEASE_BRANCH='release'" >> $HESTIA/conf/hestia.conf
+    $HESTIA/bin/v-change-sys-config-value 'RELEASE_BRANCH' 'release'
 fi
 fi
 
 
 # Back up old template files and install the latest versions
 # Back up old template files and install the latest versions