Fixes for php remi

func/domain.sh

@@ -425,14 +425,18 @@ add_web_config() {
 
 	MOD_CONF="/etc/httpd/conf.modules.d/09-mod-php.conf"
 	PHP_DEFAULT="/usr/bin/php-cgi"
-	php_ver=$(grep -m1 '^LoadModule php_module ' "$MOD_CONF" | grep -oP 'php\d{2}')
+	if [ -e $MOD_CONF ]; then
+	    php_ver=$(grep -m1 '^LoadModule php_module ' "$MOD_CONF" | grep -oP 'php\d{2}')
+	else
+        php_ver=$(find /etc/httpd/conf.modules.d -maxdepth 1 -type f -name '*-php*-php.conf' -print -quit | sed -n 's/.*-\(php[0-9]\+\)-php\.conf$/\1/p')
+	fi
 	php_cgi_path=$PHP_DEFAULT
 
 	if [ -n "$php_ver" ]; then
     	if [ -n "$php_type" ]; then
     		php_cgi_path="/opt/brepo/${php_ver}/bin/php-cgi"
     	else
-    		php_cgi_path="/opt/remi/php${php_ver}/root/bin/php-cgi"
+    		php_cgi_path="/opt/remi/${php_ver}/root/bin/php-cgi"
     	fi
 	fi
 

install/rpm/templates/web/httpd/phpfcgid.stpl

@@ -43,12 +43,5 @@
 
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
     IncludeOptional /etc/httpd/conf.h.d/*.inc
-    <IfModule mod_ruid2.c>
+
-        RMode config
-        RUidGid %user% %group%
-        RGroups apache
-    </IfModule>
-    <IfModule mpm_itk.c>
-        AssignUserID %user% %group%
-    </IfModule>
 </VirtualHost>

install/rpm/templates/web/httpd/phpfcgid.tpl

@@ -38,12 +38,5 @@
     </Directory>
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
     IncludeOptional /etc/httpd/conf.h.d/*.inc
-    <IfModule mod_ruid2.c>
+
-        RMode config
-        RUidGid %user% %group%
-        RGroups apache
-    </IfModule>
-    <IfModule mpm_itk.c>
-        AssignUserID %user% %group%
-    </IfModule>
 </VirtualHost>