Apache user/group

bin/v-add-web-domain

@@ -95,7 +95,7 @@ chmod 640 /var/log/$WEB_SYSTEM/domains/$domain.*
 chmod 751 $HOMEDIR/$user/web/$domain $HOMEDIR/$user/web/$domain/*
 chmod 551 $HOMEDIR/$user/web/$domain/stats $HOMEDIR/$user/web/$domain/logs
 chmod 644 $HOMEDIR/$user/web/$domain/public_*html/*
-chown $user:www-data $HOMEDIR/$user/web/$domain/public_*html
+chown $user:$WEB_RGROUPS $HOMEDIR/$user/web/$domain/public_*html
 
 # Addding PHP-FPM backend
 if [ ! -z "$WEB_BACKEND" ]; then

bin/v-add-web-domain-backend

@@ -61,6 +61,7 @@ done
 cat $WEBTPL/$WEB_BACKEND/$template.tpl |\
     sed -e "s|%backend_port%|$backend_port|" \
         -e "s|%user%|$user|g"\
+        -e "s|%apache_group%|$WEB_RGROUPS|g"\
         -e "s|%domain%|$domain|g"\
         -e "s|%backend%|$backend_type|g"\
         -e "s|%backend_version%|$backend_version|g" > $pool/$backend_type.conf

bin/v-add-web-domain-stats

@@ -74,6 +74,7 @@ cat $WEBTPL/$type/$type.tpl |\
         -e "s|%domain_idn%|$domain_idn|g" \
         -e "s|%domain%|$domain|g" \
         -e "s|%user%|$user|g" \
+        -e "s|%apache_group%|$WEB_RGROUPS|g"\
         -e "s|%home%|$HOMEDIR|g" \
         -e "s|%alias%|${aliases//,/ }|g" \
         -e "s|%alias_idn%|$stats_alias|g" \

bin/v-change-web-domain-backend-tpl

@@ -67,6 +67,7 @@ done
 cat $WEBTPL/$WEB_BACKEND/$template.tpl |\
     sed -e "s|%backend_port%|$backend_port|" \
         -e "s|%user%|$user|g"\
+        -e "s|%apache_group%|$WEB_RGROUPS|g"\
         -e "s|%domain%|$domain|g"\
         -e "s|%domain_idn%|$domain_idn|"\
         -e "s|%backend%|$backend_type|g"\

bin/v-change-web-domain-stats

@@ -74,6 +74,7 @@ cat $WEBTPL/$type/$type.tpl |\
         -e "s|%domain_idn%|$domain_idn|g" \
         -e "s|%domain%|$domain|g" \
         -e "s|%user%|$user|g" \
+        -e "s|%apache_group%|$WEB_RGROUPS|g"\
         -e "s|%home%|$HOMEDIR|g" \
         -e "s|%alias%|${aliases//,/ }|g" \
         -e "s|%alias_idn%|$stats_alias|g" \

func/domain.sh

@@ -223,6 +223,7 @@ add_web_config() {
             -e "s/%proxy_extentions%/${PROXY_EXT//,/|}/g" \
             -e "s|%user%|$user|g" \
             -e "s|%group%|$user|g" \
+            -e "s|%apache_group%|$WEB_RGROUPS|g"\
             -e "s|%home%|$HOMEDIR|g" \
             -e "s|%docroot%|$docroot|g" \
             -e "s|%sdocroot%|$sdocroot|g" \
@@ -737,6 +738,7 @@ add_webmail_config() {
             -e "s/%proxy_extentions%/${PROXY_EXT//,/|}/g" \
             -e "s|%user%|$user|g" \
             -e "s|%group%|$user|g" \
+            -e "s|%apache_group%|$WEB_RGROUPS|g"\
             -e "s|%home%|$HOMEDIR|g" \
             -e "s|%docroot%|$docroot|g" \
             -e "s|%sdocroot%|$sdocroot|g" \

func/rebuild.sh

@@ -288,6 +288,7 @@ rebuild_web_domain_conf() {
                 -e "s|%domain_idn%|$domain_idn|g" \
                 -e "s|%domain%|$domain|g" \
                 -e "s|%user%|$user|g" \
+                -e "s|%apache_group%|$WEB_RGROUPS|g"\
                 -e "s|%home%|$HOMEDIR|g" \
                 -e "s|%alias%|${aliases//,/ }|g" \
                 -e "s|%alias_idn%|${aliases_idn//,/ }|g" \
@@ -394,7 +395,7 @@ rebuild_web_domain_conf() {
                 $HOMEDIR/$user/web/$domain/document_errors
     chmod 640 /var/log/$WEB_SYSTEM/domains/$domain.*
 
-    chown $user:www-data $HOMEDIR/$user/web/$domain/public_html \
+    chown $user:$WEB_RGROUPS $HOMEDIR/$user/web/$domain/public_html \
                 $HOMEDIR/$user/web/$domain/public_shtml
 }
 

install/deb/php-fpm/multiphp.tpl

@@ -3,7 +3,7 @@
 [%domain%]
 listen = /run/php/php%backend_version%-fpm-%domain%.sock
 listen.owner = %user%
-listen.group = www-data
+listen.group = %apache_group%
 listen.mode = 0660
 
 user = %user%

install/deb/templates/web/apache2/default.stpl

@@ -31,7 +31,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups www-data
+        RGroups %apache_group%
     </IfModule>
     <IfModule mpm_itk.c>
         AssignUserID %user% %group%

install/deb/templates/web/apache2/default.tpl

@@ -28,7 +28,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups www-data
+        RGroups %apache_group%
     </IfModule>
     <IfModule mpm_itk.c>
         AssignUserID %user% %group%

install/deb/templates/web/apache2/hosting.stpl

@@ -37,7 +37,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups www-data
+        RGroups %apache_group%
     </IfModule>
     <IfModule mpm_itk.c>
         AssignUserID %user% %group%

install/deb/templates/web/apache2/hosting.tpl

@@ -34,7 +34,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups www-data
+        RGroups %apache_group%
     </IfModule>
     <IfModule mpm_itk.c>
         AssignUserID %user% %group%

install/deb/templates/web/php-fpm/default.tpl

@@ -3,7 +3,7 @@
 [%backend%]
 listen = /run/php/php%backend_version%-fpm-%domain%.sock
 listen.owner = %user%
-listen.group = www-data
+listen.group = %apache_group%
 listen.mode = 0660
 
 user = %user%

install/deb/templates/web/php-fpm/no-php.tpl

@@ -3,7 +3,7 @@
 ;[%backend%]
 ;listen = /var/run/php/%backend%.sock
 ;listen.owner = %user%
-;listen.group = www-data
+;listen.group = %apache_group%
 ;listen.mode = 0660
 
 ;user = %user%

install/deb/templates/web/php-fpm/socket.tpl

@@ -3,7 +3,7 @@
 [%backend%]
 listen = /var/run/php/%backend%.sock
 listen.owner = %user%
-listen.group = www-data
+listen.group = %apache_group%
 listen.mode = 0660
 
 user = %user%

install/hst-install-centos.sh

@@ -910,6 +910,7 @@ if [ "$apache" = 'yes' ] && [ "$nginx"  = 'yes' ] ; then
 fi
 if [ "$apache" = 'no' ] && [ "$nginx"  = 'yes' ]; then
     echo "WEB_SYSTEM='nginx'" >> $HESTIA/conf/hestia.conf
+    echo "WEB_RGROUPS='apache'" >> $HESTIA/conf/hestia.conf
     echo "WEB_PORT='80'" >> $HESTIA/conf/hestia.conf
     echo "WEB_SSL_PORT='443'" >> $HESTIA/conf/hestia.conf
     echo "WEB_SSL='openssl'"  >> $HESTIA/conf/hestia.conf

install/hst-install-debian.sh

@@ -1037,6 +1037,7 @@ if [ "$apache" = 'yes' ] && [ "$nginx"  = 'yes' ] ; then
 fi
 if [ "$apache" = 'no' ] && [ "$nginx"  = 'yes' ]; then
     echo "WEB_SYSTEM='nginx'" >> $HESTIA/conf/hestia.conf
+    echo "WEB_RGROUPS='www-data'" >> $HESTIA/conf/hestia.conf
     echo "WEB_PORT='80'" >> $HESTIA/conf/hestia.conf
     echo "WEB_SSL_PORT='443'" >> $HESTIA/conf/hestia.conf
     echo "WEB_SSL='openssl'"  >> $HESTIA/conf/hestia.conf

install/hst-install-ubuntu.sh

@@ -1071,6 +1071,7 @@ if [ "$apache" = 'yes' ] && [ "$nginx"  = 'yes' ] ; then
 fi
 if [ "$apache" = 'no' ] && [ "$nginx"  = 'yes' ]; then
     echo "WEB_SYSTEM='nginx'" >> $HESTIA/conf/hestia.conf
+    echo "WEB_RGROUPS='www-data'" >> $HESTIA/conf/hestia.conf
     echo "WEB_PORT='80'" >> $HESTIA/conf/hestia.conf
     echo "WEB_SSL_PORT='443'" >> $HESTIA/conf/hestia.conf
     echo "WEB_SSL='openssl'"  >> $HESTIA/conf/hestia.conf