Merge branch 'fix/2020-07_db-edit-url' into staging/fixes

Author: Kristan Kenney

install/deb/nginx/phpmyadmin.inc

@@ -6,14 +6,14 @@ location /%pma_alias% {
         return 404;
     }
 
-    location ~ ^/phpmyadmin/(.*\.php)$ {
+    location ~ ^/%pma_alias%/(.*\.php)$ {
         alias /usr/share/phpmyadmin/$1;
         fastcgi_pass 127.0.0.1:9000;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $request_filename;
     }
-    location /phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
+    location /%pma_alias%/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
         root /usr/share/phpmyadmin/;
     }
 }

install/deb/nginx/phppgadmin.inc

@@ -1,7 +1,7 @@
 location /%pga_alias% {
     alias /usr/share/phppgadmin/;
 
-    location ~ ^/phppgadmin/(.*\.php)$ {
+    location ~ ^/%pga_alias%/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
         fastcgi_pass 127.0.0.1:9000;
         fastcgi_index index.php;

install/upgrade/versions/latest.sh

@@ -181,20 +181,33 @@ if [ -e /var/lib/phpmyadmin/blowfish_secret.inc.php ]; then
     chmod 0644 /var/lib/phpmyadmin/blowfish_secret.inc.php
 fi
 
-# Add phpMyAdmin/phpPgAdmin aliases to hestia.conf and correct configuration/templates
+# Ensure that backup compression level is correctly set
+GZIP_LVL_CHECK=$(cat $HESTIA/conf/hestia.conf | grep BACKUP_GZIP)
+if [ -z "$GZIP_LVL_CHECK" ]; then
+    echo "[ * ] Updating backup compression level variable..."
+    $BIN/v-change-sys-config-value "BACKUP_GZIP" '9'
+fi
+
+# Update phpMyAdmin/phpPgAdmin templates and set missing alias variables if necessary
 if [ -e "/var/lib/phpmyadmin" ]; then
-PMA_ALIAS_CHECK=$(cat $HESTIA/conf/hestia.conf | grep DB_PMA_ALIAS)
+    PMA_ALIAS_CHECK=$(cat $HESTIA/conf/hestia.conf | grep DB_PMA_ALIAS)
     if [ -z "$PMA_ALIAS_CHECK" ]; then
         echo "[ * ] Updating phpMyAdmin alias..."
-        $HESTIA/bin/v-change-sys-db-alias "pma" "phpmyadmin"
+        $HESTIA/bin/v-change-sys-db-alias "pma" "phpMyAdmin"
+    else
+        echo "[ * ] Updating phpMyAdmin configuration..."
+        $HESTIA/bin/v-change-sys-db-alias "pma" "$DB_PMA_ALIAS"
     fi
 fi
 
 if [ -e "/var/lib/phppgadmin" ]; then
-PGA_ALIAS_CHECK=$(cat $HESTIA/conf/hestia.conf | grep DB_PGA_ALIAS)
+    PGA_ALIAS_CHECK=$(cat $HESTIA/conf/hestia.conf | grep DB_PGA_ALIAS)
     if [ -z "$PGA_ALIAS_CHECK" ]; then
         echo "[ * ] Updating phpPgAdmin alias..."
-        $HESTIA/bin/v-change-sys-db-alias "pga" "phppgadmin"
+        $HESTIA/bin/v-change-sys-db-alias "pga" "phpPgAdmin"
+    else
+        echo "[ * ] Updating phpPgAdmin configuration..."
+        $HESTIA/bin/v-change-sys-db-alias "pga" "$DB_PGA_ALIAS"
     fi
 fi