From: root <root@uhu1.uhu-banane.de>
Date: Fri, 11 Nov 2016 11:29:09 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a9c94fb1446726b103e1da4a00a2bc15a7e2a4c0;p=config%2Fuhu1%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/.etckeeper b/.etckeeper
index 0a4a2ea..fe3479d 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -67,6 +67,7 @@ maybe chmod 0644 'apache2/info_users_passwd'
 maybe chmod 0644 'apache2/magic'
 maybe chmod 0755 'apache2/modules.d'
 maybe chmod 0644 'apache2/modules.d/._cfg0000_00_apache_manual.conf'
+maybe chmod 0644 'apache2/modules.d/._cfg0000_70_mod_php5.conf'
 maybe chmod 0644 'apache2/modules.d/.keep_dev-vcs_subversion-0'
 maybe chmod 0644 'apache2/modules.d/.keep_www-servers_apache-2'
 maybe chmod 0644 'apache2/modules.d/00_apache_manual.conf'
@@ -210,6 +211,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 0644 'conf.d/portmap'
 maybe chmod 0644 'conf.d/postgresql-9.5'
 maybe chmod 0640 'conf.d/postgrey'
diff --git a/apache2/modules.d/._cfg0000_70_mod_php5.conf b/apache2/modules.d/._cfg0000_70_mod_php5.conf
new file mode 100644
index 0000000..bd79f78
--- /dev/null
+++ b/apache2/modules.d/._cfg0000_70_mod_php5.conf
@@ -0,0 +1,28 @@
+###########
+# WARNING #
+###########
+#
+# This file is provided for backwards compatibility only. The Apache
+# PHP configuration is now located in 70_mod_php.conf and requires you
+# to set -DPHP in your Apache conf.d file. Please examine
+# 70_mod_php.conf and update your Apache configuration to use -DPHP
+# instead of -DPHP5. Afterwards you may delete this file.
+#
+<IfDefine PHP5>
+	# Load the module first
+	<IfModule !mod_php5.c>
+		LoadModule php5_module    modules/libphp5.so
+	</IfModule>
+
+	# Set it to handle the files
+	# NOTE: Avoiding AddHandler/AddType for security (bug #538822)
+	# NOTE: Please read the related news item!
+	<FilesMatch "\.(php|php5|phtml)$">
+		SetHandler application/x-httpd-php
+	</FilesMatch>
+	<FilesMatch "\.phps$">
+		SetHandler application/x-httpd-php-source
+	</FilesMatch>
+
+	DirectoryIndex index.php index.phtml
+</IfDefine>
diff --git a/conf.d/php-fpm b/conf.d/php-fpm
new file mode 100644
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 6502ab9..6369e9f 100755
--- 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}"