Update variables, then config file

bin/package/web-server/integrate.inc

@@ -11,51 +11,71 @@ hestia_package_web-server_integrate() {
 
     if [ "$apache_installed" ] && [ ! "$nginx_installed" ] ; then
         echo "Setup Web module (Apache only)..."
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SYSTEM' $OSAL_PKG_APACHE
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_RGROUPS' $OSAL_USER_APACHE_DATA
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_PORT' '80'
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SSL_PORT' '443'
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SSL' 'mod_ssl'
-        osal_kv_write $HESTIA/conf/hestia.conf 'PROXY_SYSTEM' ''
-        osal_kv_delete $HESTIA/conf/hestia.conf 'PROXY_PORT'
-        osal_kv_delete $HESTIA/conf/hestia.conf 'PROXY_SSL_PORT'
-
+        WEB_SYSTEM=$OSAL_PKG_APACHE
+        WEB_RGROUPS=$OSAL_USER_APACHE_DATA
+        WEB_PORT='80'
+        WEB_SSL_PORT='443'
+        WEB_SSL='mod_ssl'
+        PROXY_SYSTEM=''
+        PROXY_PORT=''
+        PROXY_SSL_PORT=''
         osal_kv_write $HESTIA_CONF_MODULES/apache.conf 'service_name' $OSAL_SERVICE_APACHE
     elif [ "$apache_installed" ] && [ "$nginx_installed" ] ; then
         echo "Setup Web module (Apache + Nginx)..."
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SYSTEM' $OSAL_PKG_APACHE
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_RGROUPS' $OSAL_USER_APACHE_DATA
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_PORT' '8080'
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SSL_PORT' '8443'
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SSL' 'mod_ssl'
-        osal_kv_write $HESTIA/conf/hestia.conf  'PROXY_SYSTEM' 'nginx'
-        osal_kv_write $HESTIA/conf/hestia.conf  'PROXY_PORT' '80'
-        osal_kv_write $HESTIA/conf/hestia.conf  'PROXY_SSL_PORT' '443'
-
+        WEB_SYSTEM=$OSAL_PKG_APACHE
+        WEB_RGROUPS=$OSAL_USER_APACHE_DATA
+        WEB_PORT='8080'
+        WEB_SSL_PORT='8443'
+        WEB_SSL='mod_ssl'
+        PROXY_SYSTEM='nginx'
+        PROXY_PORT='80'
+        PROXY_SSL_PORT='443'
         osal_kv_write $HESTIA_CONF_MODULES/apache.conf 'service_name' $OSAL_SERVICE_APACHE
         osal_kv_write $HESTIA_CONF_MODULES/nginx.conf 'service_name' $OSAL_SERVICE_NGINX
     elif [ ! "$apache_installed" ] && [ "$nginx_installed" ]; then
         echo "Setup Web module (Nginx only)..."
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SYSTEM' 'nginx'
-        osal_kv_delete $HESTIA/conf/hestia.conf 'WEB_RGROUPS'
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_PORT' '80'
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SSL_PORT' '443'
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SSL' 'openssl'
-        osal_kv_write $HESTIA/conf/hestia.conf 'PROXY_SYSTEM' ''
-        osal_kv_delete $HESTIA/conf/hestia.conf 'PROXY_PORT'
-        osal_kv_delete $HESTIA/conf/hestia.conf 'PROXY_SSL_PORT'
-
+        WEB_SYSTEM='nginx'
+        WEB_RGROUPS=''
+        WEB_PORT='80'
+        WEB_SSL_PORT='443'
+        WEB_SSL='openssl'
+        PROXY_SYSTEM=''
+        PROXY_PORT=''
+        PROXY_SSL_PORT=''
         osal_kv_write $HESTIA_CONF_MODULES/nginx.conf 'service_name' $OSAL_SERVICE_NGINX
     else
         echo "Remove Web module setup..."
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SYSTEM' ''
-        osal_kv_delete $HESTIA/conf/hestia.conf 'WEB_RGROUPS'
-        osal_kv_delete $HESTIA/conf/hestia.conf 'WEB_PORT' '80'
-        osal_kv_delete $HESTIA/conf/hestia.conf 'WEB_SSL_PORT' '443'
-        osal_kv_delete $HESTIA/conf/hestia.conf 'WEB_SSL' 'openssl'
-        osal_kv_write $HESTIA/conf/hestia.conf 'PROXY_SYSTEM' ''
-        osal_kv_delete $HESTIA/conf/hestia.conf 'PROXY_PORT'
-        osal_kv_delete $HESTIA/conf/hestia.conf 'PROXY_SSL_PORT'
+        WEB_SYSTEM=''
+        WEB_RGROUPS=''
+        WEB_PORT='80'
+        WEB_SSL_PORT='443'
+        WEB_SSL='openssl'
+        PROXY_SYSTEM=''
+        PROXY_PORT=''
+        PROXY_SSL_PORT=''
+    fi
+
+    osal_kv_write $HESTIA/conf/hestia.conf 'WEB_SYSTEM' $WEB_SYSTEM
+    osal_kv_write $HESTIA/conf/hestia.conf 'WEB_RGROUPS' $WEB_RGROUPS
+    osal_kv_write $HESTIA/conf/hestia.conf 'WEB_PORT' $WEB_PORT
+    osal_kv_write $HESTIA/conf/hestia.conf 'WEB_SSL_PORT' $WEB_SSL_PORT
+    osal_kv_write $HESTIA/conf/hestia.conf 'WEB_SSL' $WEB_SSL
+    osal_kv_write $HESTIA/conf/hestia.conf 'PROXY_SYSTEM' $PROXY_SYSTEM
+    osal_kv_write $HESTIA/conf/hestia.conf 'PROXY_PORT' $PROXY_PORT
+    osal_kv_write $HESTIA/conf/hestia.conf 'PROXY_SSL_PORT' $PROXY_SSL_PORT
+
+    if hestia_module_isinstalled 'php-fpm'; then
+        source $HESTIA/bin/module/php-fpm/func.inc
+        for php_version in $PHP_SUPPORTED_VERSIONS; do
+            local php_withoutdot=${php_version//.}
+            php_version_present=$(osal_kv_read $HESTIA_CONF_MODULES/php-fpm.conf "php${php_withoutdot}_present" 0)
+            if [ "$php_version_present" == "1" ]; then
+                local php_prefix=$(osal_php_package_prefix $php_version)
+                osal_service_enable $php_prefix-fpm
+                osal_service_restart $php_prefix-fpm
+                echo "Enabling PHP $php_version"
+            fi
+        done
     fi
 
     if [ "$apache_installed" ] || [ "$nginx_installed" ] ; then
@@ -70,11 +90,14 @@ hestia_package_web-server_integrate() {
         hestia package web-server setup-ips
         
         # Rebuild domains
-        echo "Rebuilding web domains"
+        echo "Rebuilding web domains..."
         for user in $($HESTIA/bin/v-list-sys-users plain); do
             $BIN/v-rebuild-web-domains $user 'no' > /dev/null 2>&1
         done
 
+        osal_service_stop $OSAL_SERVICE_APACHE > /dev/null 2>&1
+        osal_service_stop $OSAL_SERVICE_NGINX > /dev/null 2>&1
+
         if [ "$apache_installed" ]; then
             osal_service_enable $OSAL_SERVICE_APACHE
             osal_service_start $OSAL_SERVICE_APACHE
@@ -85,18 +108,4 @@ hestia_package_web-server_integrate() {
             osal_service_start $OSAL_SERVICE_NGINX
         fi
     fi
-
-    if hestia_module_isinstalled 'php-fpm'; then
-        source $HESTIA/bin/module/php-fpm/func.inc
-        for php_version in $PHP_SUPPORTED_VERSIONS; do
-            local php_withoutdot=${php_version//.}
-            php_version_present=$(osal_kv_read $HESTIA_CONF_MODULES/php-fpm.conf "php${php_withoutdot}_present" 0)
-            if [ "$php_version_present" == "1" ]; then
-                local php_prefix=$(osal_php_package_prefix $php_version)
-                osal_service_enable $php_prefix-fpm
-                osal_service_restart $php_prefix-fpm
-                echo "Enabling $php_version (systemctl restart $php_prefix-fpm)"
-            fi
-        done
-    fi
 }