saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 3f2ce6f99e7ea7b3a47fb562d91fc977e53d043f..776283bcec6042eb7c00c5cfcaed302e80e1e0fc 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -450,6 +450,7 @@ maybe chmod 0644 'conf.d/ntp-client'
 maybe chmod 0644 'conf.d/ntpd'
 maybe chmod 0644 'conf.d/openvpn'
 maybe chmod 0644 'conf.d/pciparm'
+maybe chmod 0644 'conf.d/php-fpm'
 maybe chmod 0640 'conf.d/postgrey'
 maybe chmod 0644 'conf.d/pydoc-2.7'
 maybe chmod 0644 'conf.d/pydoc-3.4'

diff --git a/conf.d/php-fpm b/conf.d/php-fpm
new file mode 100644 (file)
index 0000000..b3efdbf
--- /dev/null
+++ b/conf.d/php-fpm
@@ -0,0 +1,8 @@
+# The OpenRC conf.d file that accompanies the php-fpm init script.
+# Not to be confused with the php-fpm.conf file that ships with
+# PHP itself.
+
+# Set the umask of the FPM process to the given (octal) value. This is
+# passed directly to start-stop-daemon. If not specified, the system
+# default will be used.
+#PHP_FPM_UMASK=0002

diff --git a/init.d/php-fpm b/init.d/php-fpm
index 6502ab9b7d0f0d8539a6958aa463b90327982f92..6369e9f913d1bc18eae98947e517b9dee031556b 100755 (executable)
--- a/init.d/php-fpm
+++ b/init.d/php-fpm
@@ -23,6 +23,7 @@ start() {
        set_phpvars
         start-stop-daemon --start --pidfile "${PHP_FPM_PID}" \
                          --exec "${PHP_FPM_BIN}" \
+                         ${PHP_FPM_UMASK:+--umask ${PHP_FPM_UMASK}} \
                          -- \
                          --fpm-config "${PHP_FPM_CONF}" \
                          --pid "${PHP_FPM_PID}"