From: Frank Brehm <frank@brehm-online.com>
Date: Sun, 7 Jan 2018 21:43:17 +0000 (+0100)
Subject: committing changes in /etc after emerge run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=7d1d98a8ed7dfa8e5f0c306f24f0f1fa8bb193fe;p=config%2Fbruni%2Fetc.git

committing changes in /etc after emerge run

Package changes:
---

diff --git a/.etckeeper b/.etckeeper
index 05a132d5..cde9d876 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -182,7 +182,6 @@ maybe chmod 0644 'apache2/modules.d/45_mod_dav.conf'
 maybe chmod 0644 'apache2/modules.d/46_mod_ldap.conf'
 maybe chmod 0644 'apache2/modules.d/47_mod_dav_svn.conf'
 maybe chmod 0644 'apache2/modules.d/70_mod_php.conf'
-maybe chmod 0644 'apache2/modules.d/70_mod_php5.conf'
 maybe chmod 0644 'apache2/modules.d/80_mod_dnssd.conf'
 maybe chmod 0755 'apache2/vhosts.d'
 maybe chmod 0644 'apache2/vhosts.d/.keep_www-servers_apache-2'
diff --git a/apache2/modules.d/70_mod_php5.conf b/apache2/modules.d/70_mod_php5.conf
deleted file mode 100644
index bd79f78a..00000000
--- a/apache2/modules.d/70_mod_php5.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-###########
-# 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>