www-data -> apache

install/rhel/apache2/apache2.conf

@@ -49,8 +49,8 @@ KeepAliveTimeout 10
 # These need to be set in /etc/apache2/envvars
 User ${APACHE_RUN_USER}
 Group ${APACHE_RUN_GROUP}
-#User www-data
-#Group www-data
+#User apache
+#Group apache
 
 AccessFileName .htaccess
 

install/rhel/multiphp/apache2/PHP-56.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php5.6-fpm-$2.sock
 listen.owner = $1
-listen.group = www-data
+listen.group = apache
 listen.mode = 0660
 
 user = $1

install/rhel/multiphp/apache2/PHP-70.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.0-fpm-$2.sock
 listen.owner = $1
-listen.group = www-data
+listen.group = apache
 listen.mode = 0660
 
 user = $1

install/rhel/multiphp/apache2/PHP-71.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.1-fpm-$2.sock
 listen.owner = $1
-listen.group = www-data
+listen.group = apache
 listen.mode = 0660
 
 user = $1

install/rhel/multiphp/apache2/PHP-72.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.2-fpm-$2.sock
 listen.owner = $1
-listen.group = www-data
+listen.group = apache
 listen.mode = 0660
 
 user = $1

install/rhel/multiphp/apache2/PHP-73.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.3-fpm-$2.sock
 listen.owner = $1
-listen.group = www-data
+listen.group = apache
 listen.mode = 0660
 
 user = $1

install/rhel/multiphp/apache2/PHP-74.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.4-fpm-$2.sock
 listen.owner = $1
-listen.group = www-data
+listen.group = apache
 listen.mode = 0660
 
 user = $1

install/rhel/multiphp/nginx/PHP-56.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php5.6-fpm-$2.sock
 listen.owner = $1
-listen.group = www-data
+listen.group = apache
 listen.mode = 0660
 
 user = $1

install/rhel/multiphp/nginx/PHP-70.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.0-fpm-$2.sock
 listen.owner = $1
-listen.group = www-data
+listen.group = apache
 listen.mode = 0660
 
 user = $1

install/rhel/multiphp/nginx/PHP-71.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.1-fpm-$2.sock
 listen.owner = $1
-listen.group = www-data
+listen.group = apache
 listen.mode = 0660
 
 user = $1

install/rhel/multiphp/nginx/PHP-72.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.2-fpm-$2.sock
 listen.owner = $1
-listen.group = www-data
+listen.group = apache
 listen.mode = 0660
 
 user = $1

install/rhel/multiphp/nginx/PHP-73.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.3-fpm-$2.sock
 listen.owner = $1
-listen.group = www-data
+listen.group = apache
 listen.mode = 0660
 
 user = $1

install/rhel/multiphp/nginx/PHP-74.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.4-fpm-$2.sock
 listen.owner = $1
-listen.group = www-data
+listen.group = apache
 listen.mode = 0660
 
 user = $1

install/rhel/nginx/nginx.conf

@@ -1,5 +1,5 @@
 # Server globals
-user                    www-data;
+user                    apache;
 worker_processes        auto;
 worker_rlimit_nofile    65535;
 error_log               /var/log/nginx/error.log;

install/rhel/php-fpm/dummy.conf

@@ -4,8 +4,8 @@
 listen = 127.0.0.1:9999
 listen.allowed_clients = 127.0.0.1
 
-user = www-data
-group = www-data
+user = apache
+group = apache
 
 pm = ondemand
 pm.max_children = 4

install/rhel/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
 listen.mode = 0660
 
 user = %user%

install/rhel/php-fpm/www.conf

@@ -4,8 +4,8 @@
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 
-user = www-data
-group = www-data
+user = apache
+group = apache
 
 pm = ondemand
 pm.max_children = 4

install/rhel/pma/config.inc.php

@@ -24,7 +24,7 @@ function check_file_access($path)
     } else {
         error_log(
             'phpmyadmin: Failed to load ' . $path
-            . ' Check group www-data has read access and open_basedir restrictions.'
+            . ' Check group apache has read access and open_basedir restrictions.'
         );
         return false;
     }

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

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

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

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

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

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

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

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

install/rhel/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
 listen.mode = 0660
 
 user = %user%

install/rhel/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
 ;listen.mode = 0660
 
 ;user = %user%

install/rhel/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
 listen.mode = 0660
 
 user = %user%