Use boolean

bin/module/web/setup.inc

@@ -6,9 +6,9 @@ hestia_module_web_setup() {
     apache_installed=$(hestia_module_isinstalled apache)
     nginx_installed=$(hestia_module_isinstalled nginx)
 
-    if [ "$apache_installed" = 'yes' ] && [ "$nginx_installed" = 'no' ] ; then
+    if [ "$apache_installed" ] && [ ! "$nginx_installed" ] ; then
         echo "Setup Web module (Apache only)..."
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SYSTEM' 'apache2'
+        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SYSTEM' 'httpd'
         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'
@@ -22,9 +22,9 @@ hestia_module_web_setup() {
         osal_kv_write $HESTIA_CONF_MODULES/web.conf 'variant' 'apache2'
         osal_kv_write $HESTIA_CONF_MODULES/web.conf 'version' '1'
         osal_kv_write $HESTIA_CONF_MODULES/web.conf 'service_name' $OSAL_SERVICE_APACHE
-    elif [ "$apache_installed" = 'yes' ] && [ "$nginx_installed"  = 'yes' ] ; then
+    elif [ "$apache_installed" ] && [ "$nginx_installed" ] ; then
         echo "Setup Web module (Apache + Nginx)..."
-        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SYSTEM' 'apache2'
+        osal_kv_write $HESTIA/conf/hestia.conf  'WEB_SYSTEM' 'httpd'
         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'
@@ -38,7 +38,7 @@ hestia_module_web_setup() {
         osal_kv_write $HESTIA_CONF_MODULES/web.conf 'variant' 'apache2+nginx'
         osal_kv_write $HESTIA_CONF_MODULES/web.conf 'version' '1'
         osal_kv_write $HESTIA_CONF_MODULES/web.conf 'service_name' "$OSAL_SERVICE_APACHE $OSAL_SERVICE_NGINX"
-    elif [ "$apache_installed" = 'no' ] && [ "$nginx_installed"  = 'yes' ]; then
+    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'
@@ -97,12 +97,42 @@ hestia_module_web_setup() {
         fi
     fi
 
+    # FIXME: setup PHP support
+    php_variant=$(hestia_module_variant_installed php)
+    if [ "$apache_installed" ]; then
+        # Enable mod_ruid/mpm_itk or mpm_event
+        if [ "$php_variant" = 'php-fpm' ]; then
+            # Disable prefork and php, enable event
+            osal_apache_module_disable php$fpm_v > /dev/null 2>&1
+            osal_apache_module_disable mpm_prefork > /dev/null 2>&1
+            osal_apache_module_enable mpm_event > /dev/null 2>&1
+            cp -f $HESTIA_INSTALL_DIR/apache2/hestia-event.conf /etc/apache2/conf.d/
+        else
+            osal_apache_module_enable ruid2 > /dev/null 2>&1
+        fi
+    fi
+
     # FIXME: move the following to awstats install
     osal_kv_write $HESTIA/conf/hestia.conf 'STATS_SYSTEM' 'awstats'
 
     # Rebuild mail
     for user in $($HESTIA/bin/v-list-sys-users plain); do
         echo "Rebuilding web domains for user $user"
-        $BIN/v-rebuild-web-domains $user 'no' >/dev/null 2>&1
+        $BIN/v-rebuild-web-domains $user 'no' > /dev/null 2>&1
     done
+
+    osal_service_stop $OSAL_SERVICE_NGINX > /dev/null 2>&1
+    osal_service_stop $OSAL_SERVICE_APACHE > /dev/null 2>&1
+
+    if [ "$apache_installed" ]; then
+        osal_service_enable $OSAL_SERVICE_APACHE
+        osal_service_start $OSAL_SERVICE_APACHE
+    fi
+
+    if [ "$nginx_installed" ]; then
+        osal_service_enable $OSAL_SERVICE_NGINX
+        osal_service_start $OSAL_SERVICE_NGINX
+    fi
+    check_result $? "Nginx start failed"
+
 }