Merge pull request #5610 from craigcomstock/ENT-11440-2/master

Added cf-php-fpm systemd service unit template for http2 enablement in Mission Portal

Author: craigcomstock

configure.ac

@@ -1596,6 +1596,7 @@ AC_ARG_WITH(systemd-service, AS_HELP_STRING([--with-systemd-service=PATH],
 AS_IF([test "x$SYSTEMD_SERVICE_PATH" = "x"], [], [
     AC_SUBST([SYSTEMD_SERVICE_PATH])
     AC_CONFIG_FILES([misc/systemd/cfengine3.service])
+    AC_CONFIG_FILES([misc/systemd/cf-php-fpm.service])
     AC_CONFIG_FILES([misc/systemd/cf-apache.service])
     AC_CONFIG_FILES([misc/systemd/cf-execd.service])
     AC_CONFIG_FILES([misc/systemd/cf-hub.service])

misc/Makefile.am

@@ -2,6 +2,7 @@ SUBDIRS = selinux
 
 # include unconditionally in the distribution tarball
 EXTRA_DIST= init.d/cfengine3.in \
+	systemd/cf-php-fpm.service.in \
 	systemd/cf-apache.service.in \
 	systemd/cf-execd.service.in \
 	systemd/cf-hub.service.in \
@@ -21,6 +22,7 @@ endif
 if WITH_SYSTEMD_SERVICE
 systemddir = $(SYSTEMD_SERVICE_PATH)
 systemd_DATA   = systemd/cfengine3.service
+systemd_DATA  += systemd/cf-php-fpm.service
 systemd_DATA  += systemd/cf-apache.service
 systemd_DATA  += systemd/cf-execd.service
 systemd_DATA  += systemd/cf-hub.service

misc/selinux/cfengine-enterprise.fc

@@ -9,5 +9,6 @@
 /var/cfengine/httpd/bin/apachectl      --	gen_context(system_u:object_r:cfengine_apachectl_exec_t,s0)
 /var/cfengine/httpd/bin/.*      --	gen_context(system_u:object_r:cfengine_httpd_exec_t,s0)
 /var/cfengine/httpd/php/bin/.*  --	gen_context(system_u:object_r:cfengine_httpd_exec_t,s0)
+/var/cfengine/httpd/php/sbin/.*  --	gen_context(system_u:object_r:cfengine_httpd_exec_t,s0)
 /opt/cfengine(/.*)?             	gen_context(system_u:object_r:cfengine_var_lib_t,s0)
 /opt/cfengine/notification_scripts(/.*)?             	gen_context(system_u:object_r:cfengine_action_script_exec_t,s0)

misc/systemd/cf-apache.service.in

@@ -1,8 +1,8 @@
 [Unit]
 Description=CFEngine Enterprise Webserver
 After=syslog.target
-Wants=cf-postgres.service
-After=cf-postgres.service
+Wants=cf-php-fpm.service
+After=cf-php-fpm.service
 ConditionPathExists=@workdir@/httpd/bin/apachectl
 PartOf=cfengine3.service
 

misc/systemd/cf-php-fpm.service.in

@@ -0,0 +1,16 @@
+[Unit]
+Description=CFEngine Enterprise PHP FastCGI Process Manager
+After=syslog.target
+Wants=cf-postgres.service
+After=cf-postgres.service
+ConditionPathExists=@workdir@/httpd/php/sbin/php-fpm
+PartOf=cfengine3.service
+
+[Service]
+ExecStart=@workdir@/httpd/php/sbin/php-fpm --nodaemonize --force-stderr
+ExecReload=/bin/kill -USR2 $MAINPID
+PIDFile=@workdir@/httpd/php-fpm.pid
+Type=simple
+
+[Install]
+WantedBy=multi-user.target

misc/systemd/cfengine3.service.in

@@ -9,6 +9,7 @@ Wants=cf-serverd.service
 Wants=cf-execd.service
 Wants=cf-monitord.service
 Wants=cf-postgres.service
+Wants=cf-php-fpm.service
 Wants=cf-apache.service
 Wants=cf-hub.service
 Wants=cf-reactor.service
@@ -18,6 +19,7 @@ Before=cf-serverd.service
 Before=cf-execd.service
 Before=cf-monitord.service
 Before=cf-postgres.service
+Before=cf-php-fpm.service
 Before=cf-apache.service
 Before=cf-hub.service
 Before=cf-reactor.service