diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-05 06:54:37 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-05 06:54:37 +0000 |
| commit | c370024c2c07eb047a77ed7f90a6cf921e0da6fb (patch) | |
| tree | c2420c68f607583673ed2520ea0b93bd1b7e7f17 | |
| parent | b7b3d50f7827e6669d2fb4c595642f05cbf75d84 (diff) | |
| parent | b037c434979fb0bd2ad1960b85a8aa2989fc09e6 (diff) | |
| download | php-git-c370024c2c07eb047a77ed7f90a6cf921e0da6fb.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix php-fpm.service.in
| -rw-r--r-- | sapi/fpm/php-fpm.service.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/fpm/php-fpm.service.in b/sapi/fpm/php-fpm.service.in index e2c807426b..a4d533c197 100644 --- a/sapi/fpm/php-fpm.service.in +++ b/sapi/fpm/php-fpm.service.in @@ -4,12 +4,12 @@ [Unit] Description=The PHP FastCGI Process Manager -After=syslog.target network.target +After=network.target [Service] Type=@php_fpm_systemd@ -PIDFile=@localstatedir@/run/php-fpm.pid -ExecStart=@sbindir@/php-fpm --nodaemonize --fpm-config @sysconfdir@/php-fpm.conf +PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid +ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf ExecReload=/bin/kill -USR2 $MAINPID PrivateTmp=true |