Add fpm-nginx and fpm-httpd subpackages

Author: carlwgeorge

httpd-fpm.conf

@@ -0,0 +1,28 @@
+#
+# The following lines prevent .user.ini files from being viewed by Web clients.
+#
+<Files ".user.ini">
+    Require all denied
+</Files>
+
+#
+# Allow php to handle Multiviews
+#
+AddType text/html .php
+
+#
+# Add index.php to the list of files that will be served as directory
+# indexes.
+#
+DirectoryIndex index.php
+
+#
+# Redirect to local php-fpm (no mod_php in default configuration)
+#
+# Enable http authorization headers
+SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
+
+<FilesMatch \.(php|phar)$>
+    SetHandler "proxy:fcgi://127.0.0.1:9000"
+    #SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost"
+</FilesMatch>

nginx-fpm.conf

@@ -2,5 +2,6 @@
 # network or unix domain socket configuration
 
 upstream php-fpm {
-        server unix:/run/php-fpm/www.sock;
+        server 127.0.0.1:9000;
+        #server unix:/run/php-fpm/www.sock;
 }

php-fpm-www.conf

@@ -20,10 +20,8 @@
 ; Unix user/group of processes
 ; Note: The user is mandatory. If the group is not set, the default user's group
 ;       will be used.
-; RPM: apache user chosen to provide access to the same directories as httpd
-user = apache
-; RPM: Keep a group allowed to write in log dir.
-group = apache
+user = php-fpm
+group = php-fpm
 
 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are:
@@ -35,7 +33,10 @@ group = apache
 ;                            (IPv6 and IPv4-mapped) on a specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /run/php-fpm/www.sock
+listen = 127.0.0.1:9000
+; WARNING: If you switch to a unix socket, you have to grant your webserver user
+;          access to that socket by setting listen.acl_users to the webserver user.
+;listen = /run/php-fpm/www.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 511
@@ -52,7 +53,9 @@ listen = /run/php-fpm/www.sock
 ; When POSIX Access Control Lists are supported you can set them using
 ; these options, value is a comma separated list of user/group names.
 ; When set, listen.owner and listen.group are ignored
-listen.acl_users = apache,nginx
+;listen.acl_users = apache,nginx
+;listen.acl_users = apache
+;listen.acl_users = nginx
 ;listen.acl_groups =
 
 ; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
@@ -433,6 +436,6 @@ php_admin_flag[log_errors] = on
 ; See warning about choosing the location of these directories on your system
 ; at http://php.net/session.save-path
 php_value[session.save_handler] = files
-php_value[session.save_path]    = /var/lib/php/session
-php_value[soap.wsdl_cache_dir]  = /var/lib/php/wsdlcache
-;php_value[opcache.file_cache]  = /var/lib/php/opcache
+php_value[session.save_path]    = /var/lib/php/fpm/session
+php_value[soap.wsdl_cache_dir]  = /var/lib/php/fpm/wsdlcache
+;php_value[opcache.file_cache]  = /var/lib/php/fpm/opcache

php.conf

@@ -16,23 +16,6 @@ AddType text/html .php
 #
 DirectoryIndex index.php
 
-#
-# Redirect to local php-fpm (no mod_php in default configuration)
-#
-<IfModule !mod_php5.c>
-  <IfModule !mod_php7.c>
-    # Enable http authorization headers
-    SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
-
-    <FilesMatch \.(php|phar)$>
-        SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost"
-    </FilesMatch>
-  </IfModule>
-</IfModule>
-
-#
-# mod_php is deprecated as FPM is now used by default with httpd in event mode
-# mod_php is only used when explicitly enabled or httpd switch to prefork mode
 #
 # mod_php options
 #
@@ -57,8 +40,8 @@ DirectoryIndex index.php
     # those can be override in each configured vhost
     #
     php_value session.save_handler "files"
-    php_value session.save_path    "/var/lib/php/session"
-    php_value soap.wsdl_cache_dir  "/var/lib/php/wsdlcache"
+    php_value session.save_path    "/var/lib/php/mod_php/session"
+    php_value soap.wsdl_cache_dir  "/var/lib/php/mod_php/wsdlcache"
 
-    #php_value opcache.file_cache   "/var/lib/php/opcache"
+    #php_value opcache.file_cache   "/var/lib/php/mod_php/opcache"
 </IfModule>

php73.spec

@@ -86,6 +86,7 @@ Source9: php.modconf
 Source10: php.ztsmodconf
 Source13: nginx-fpm.conf
 Source14: nginx-php.conf
+Source15: httpd-fpm.conf
 # Configuration files for some extensions
 Source50: 10-opcache.ini
 Source51: opcache-default.blacklist
@@ -227,6 +228,30 @@ PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI
 implementation with some additional features useful for sites of
 any size, especially busier sites.
 
+%package fpm-nginx
+Summary: Nginx configuration for PHP-FPM
+BuildArch: noarch
+Requires: %{name}-fpm = %{version}-%{release}
+Requires: nginx
+# safe replacement
+Provides:  php-fpm-nginx = %{version}-%{release}
+Conflicts: php-fpm-nginx < %{version}-%{release}
+
+%description fpm-nginx
+Nginx configuration files for the PHP FastCGI Process Manager.
+
+%package fpm-httpd
+Summary: Apache HTTP Server configuration for PHP-FPM
+BuildArch: noarch
+Requires: %{name}-fpm = %{version}-%{release}
+Requires: httpd >= 2.4
+# safe replacement
+Provides:  php-fpm-httpd = %{version}-%{release}
+Conflicts: php-fpm-httpd < %{version}-%{release}
+
+%description fpm-httpd
+Apache HTTP Server configuration file for the PHP FastCGI Process Manager.
+
 %package common
 Summary: Common files for PHP
 # All files licensed under PHP version 3.01, except
@@ -1354,11 +1379,16 @@ install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d
 %endif
 install -m 755 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php
-install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/session
-install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/wsdlcache
-install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/opcache
+install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/mod_php
+install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/mod_php/session
+install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/mod_php/wsdlcache
+install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/mod_php/opcache
 
 # PHP-FPM stuff
+install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/fpm
+install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/fpm/session
+install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/fpm/wsdlcache
+install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/fpm/opcache
 # Log
 install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/log/php-fpm
 install -m 755 -d $RPM_BUILD_ROOT/run/php-fpm
@@ -1377,6 +1407,8 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/php-fpm
 # Nginx configuration
 install -D -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/php-fpm.conf
 install -D -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/default.d/php.conf
+# Apache httpd configuration
+install -D -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_httpd_confdir}/php-fpm.conf
 
 # Generate files lists and stub .ini files for each subpackage
 for mod in pgsql odbc ldap snmp xmlrpc \
@@ -1514,6 +1546,13 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \
 # Remove irrelevant docs
 rm -f README.{Zeus,QNX,CVS-RULES}
 
+%pre fpm
+getent group php-fpm >/dev/null || groupadd -r php-fpm
+getent passwd php-fpm >/dev/null || \
+    useradd -r -g php-fpm -d %{_sharedstatedir}/php/fpm \
+    -s /sbin/nologin -c "php-fpm" php-fpm
+exit 0
+
 %post fpm
 %systemd_post php-fpm.service
 
@@ -1531,9 +1570,10 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 %if %{with_zts}
 %{_httpd_moddir}/libphp7-zts.so
 %endif
-%attr(0770,root,apache) %dir %{_sharedstatedir}/php/session
-%attr(0770,root,apache) %dir %{_sharedstatedir}/php/wsdlcache
-%attr(0770,root,apache) %dir %{_sharedstatedir}/php/opcache
+%attr(0770,root,apache) %dir %{_sharedstatedir}/php/mod_php
+%attr(0770,root,apache) %dir %{_sharedstatedir}/php/mod_php/session
+%attr(0770,root,apache) %dir %{_sharedstatedir}/php/mod_php/wsdlcache
+%attr(0770,root,apache) %dir %{_sharedstatedir}/php/mod_php/opcache
 %config(noreplace) %{_httpd_confdir}/php.conf
 %config(noreplace) %{_httpd_modconfdir}/15-php.conf
 %{_httpd_contentdir}/icons/php.gif
@@ -1586,26 +1626,30 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 %files fpm
 %doc php-fpm.conf.default www.conf.default
 %license fpm_LICENSE
-%attr(0770,root,apache) %dir %{_sharedstatedir}/php/session
-%attr(0770,root,apache) %dir %{_sharedstatedir}/php/wsdlcache
-%attr(0770,root,apache) %dir %{_sharedstatedir}/php/opcache
-%config(noreplace) %{_httpd_confdir}/php.conf
+%attr(0770,root,php-fpm) %dir %{_sharedstatedir}/php/fpm
+%attr(0770,root,php-fpm) %dir %{_sharedstatedir}/php/fpm/session
+%attr(0770,root,php-fpm) %dir %{_sharedstatedir}/php/fpm/wsdlcache
+%attr(0770,root,php-fpm) %dir %{_sharedstatedir}/php/fpm/opcache
 %config(noreplace) %{_sysconfdir}/php-fpm.conf
 %config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm
-%config(noreplace) %{_sysconfdir}/nginx/conf.d/php-fpm.conf
-%config(noreplace) %{_sysconfdir}/nginx/default.d/php.conf
 %{_unitdir}/php-fpm.service
 %{_sbindir}/php-fpm
 %dir %{_sysconfdir}/systemd/system/php-fpm.service.d
 %dir %{_sysconfdir}/php-fpm.d
-# log owned by apache for log
-%attr(770,apache,root) %dir %{_localstatedir}/log/php-fpm
+%attr(770,php-fpm,php-fpm) %dir %{_localstatedir}/log/php-fpm
 %dir %ghost /run/php-fpm
 %{_mandir}/man8/php-fpm.8*
 %dir %{_datadir}/fpm
 %{_datadir}/fpm/status.html
 
+%files fpm-nginx
+%config(noreplace) %{_sysconfdir}/nginx/conf.d/php-fpm.conf
+%config(noreplace) %{_sysconfdir}/nginx/default.d/php.conf
+
+%files fpm-httpd
+%config(noreplace) %{_httpd_confdir}/php-fpm.conf
+
 %files devel
 %{_bindir}/php-config
 %{_includedir}/php
@@ -1678,6 +1722,7 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 * Wed Apr 17 2019 Matt Linscott <[email protected]> - 7.3.4-2
 - Initial port from Fedora to IUS
 - Move httpd module to a mod_php subpackage
+- Add fpm-nginx and fpm-httpd subpackages
 
 * Tue Apr  2 2019 Remi Collet <[email protected]> - 7.3.4-1
 - Update to 7.3.4 - http://www.php.net/releases/7_3_4.php