Merge pull request #1974 from jaapmarcus/fix/pma-sso

Fix minor issues during upgrade 1.4.5

bin/v-add-sys-pma-sso

@@ -75,14 +75,13 @@ apikey=$($BIN/v-generate-api-key);
 
 # copy config dir to /usr/share/phpmyadmin/
 cp -f $HESTIA_INSTALL_DIR/phpmyadmin/hestia-sso.php $PMA_INSTALL/hestia-sso.php
-chmod 644 $PMA_INSTALL/hestia-sso.php 
+chmod 640 $PMA_INSTALL/hestia-sso.php 
 
 sed -i "s/%PHPMYADMIN_KEY%/$phpmyadminkey/g" $PMA_INSTALL/hestia-sso.php 
 sed -i "s/%API_KEY%/$apikey/g" $PMA_INSTALL/hestia-sso.php 
 sed -i "s/%API_HOST_NAME%/$(hostname)/g" $PMA_INSTALL/hestia-sso.php 
 sed -i "s/%API_HESTIA_PORT%/$BACKEND_PORT/g" $PMA_INSTALL/hestia-sso.php 
 
-
 # Check if config already contains the keys 
 touch $PMA_CONFIG/hestia-sso.inc.php
 chmod 640 $PMA_CONFIG/hestia-sso.inc.php

bin/v-restart-service

@@ -33,25 +33,26 @@ is_format_valid 'service' 'restart'
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Get installed php versions
-php_versions=$(ls /usr/sbin/php*fpm* | cut -d'/' -f4 | sed 's|php-fpm||')
-
-# Substitute php-fpm service name formats
-for version in $php_versions; do
-    if [ "$service" = "php-fpm${version}" ]; then
-        service="php${version}-fpm"
-    fi
-done
-
-# Multi-instance service restart request handling
-if [ "$service" = "php-fpm" ];then
+if [ -d /usr/sbin/php*/fpm/ ]; then 
+    # Get installed php versions
+    php_versions=$(ls /usr/sbin/php*fpm* | cut -d'/' -f4 | sed 's|php-fpm||')
+    
+    # Substitute php-fpm service name formats
     for version in $php_versions; do
-        service_list="${service_list} php${version}-fpm"
+        if [ "$service" = "php-fpm${version}" ]; then
+            service="php${version}-fpm"
+        fi
     done
-else
-    service_list="$service"
-fi
-
+    
+    # Multi-instance service restart request handling
+    if [ "$service" = "php-fpm" ];then
+        for version in $php_versions; do
+            service_list="${service_list} php${version}-fpm"
+        done
+    else
+        service_list="$service"
+    fi
+fi 
 for service in $service_list; do
 
     if [ "$service" = "iptables" ]; then

install/upgrade/manual/migrate_phpmyadmin.sh

@@ -52,7 +52,7 @@ then
    mkdir -p /etc/phpmyadmin
    mkdir -p /etc/phpmyadmin/conf.d/  
    mkdir /usr/share/phpmyadmin/tmp
-   chmod 777 /usr/share/phpmyadmin/tmp/
+   chmod 770 /usr/share/phpmyadmin/tmp/
    mkdir -p /etc/phpmyadmin/conf.d/  
    
    # Configuring Apache2 for PHPMYADMIN
@@ -76,7 +76,7 @@ then
    # Create copy of config file
    cp -f $HESTIA_INSTALL_DIR/phpmyadmin/config.inc.php /etc/phpmyadmin/
    mkdir -p /var/lib/phpmyadmin/tmp
-   chmod 777 -R /var/lib/phpmyadmin/tmp
+   chmod 770 -R /var/lib/phpmyadmin/tmp
    
    # Set config and log directory
    sed -i "s|define('CONFIG_DIR', ROOT_PATH);|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php

install/upgrade/versions/1.4.6.sh

@@ -5,3 +5,7 @@
 #######################################################################################
 #######                      Place additional commands below.                   #######
 #######################################################################################
+
+if [ -z "$DB_PMA_ALIAS" ]; then 
+    $HESTIA/bin/v-change-sys-db-alias 'pma' $DB_PMA_ALIAS
+fi