[php/f17] keep php-fpm forking and without PrivateTmp on f17

Remi Collet remi at fedoraproject.org
Mon Oct 1 09:19:55 UTC 2012


commit 52e589c0579edc3977a0bfdeb99f2f2c0832c306
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Oct 1 11:18:47 2012 +0200

    keep php-fpm forking and without PrivateTmp on f17

 php-fpm.service |    3 +--
 php.spec        |    1 -
 2 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/php-fpm.service b/php-fpm.service
index cfb0977..29926fc 100644
--- a/php-fpm.service
+++ b/php-fpm.service
@@ -6,9 +6,8 @@ After=syslog.target network.target
 Type=forking
 PIDFile=/run/php-fpm/php-fpm.pid
 EnvironmentFile=/etc/sysconfig/php-fpm
-ExecStart=/usr/sbin/php-fpm --nodaemonize
+ExecStart=/usr/sbin/php-fpm --daemonize
 ExecReload=/bin/kill -USR2 $MAINPID
-PrivateTmp=true
 
 [Install]
 WantedBy=multi-user.target
diff --git a/php.spec b/php.spec
index 0817082..e9d7947 100644
--- a/php.spec
+++ b/php.spec
@@ -1315,7 +1315,6 @@ fi
 
 %changelog
 * Mon Oct  1 2012 Remi Collet <remi at fedoraproject.org> 5.4.7-9
-- php-fpm: enable PrivateTmp
 - php-fpm: new systemd macros (#850268)
 - php-fpm: add upstream patch for startup issue (#846858)
 


More information about the scm-commits mailing list