saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index ca0f285ce0a7e3566c112fe15cfad03dcf2b0f4c..3e4dadf52bee04572e69ec228157802be9d71e04 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -87,7 +87,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/99_nagios4.conf'
 maybe chmod 0755 'apache2/ssl'
 maybe chmod 0600 'apache2/ssl/egroupware-cert.pem'

diff --git a/apache2/modules.d/70_mod_php5.conf b/apache2/modules.d/70_mod_php5.conf
deleted file mode 100644 (file)
index bd79f78..0000000
--- 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>

diff --git a/conf.d/apache2 b/conf.d/apache2
index 4996acedb5019a47c911970fae46cab733a5781f..eff1a4787c5b452761e7d68231a317fb90cd0d0d 100644 (file)
--- a/conf.d/apache2
+++ b/conf.d/apache2
@@ -34,7 +34,7 @@
 #                     when you enable SSL)
 #
 #APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D MANUAL -D SSL -D SSL_DEFAULT_VHOST -D SUEXEC -D LANGUAGE"
-APACHE2_OPTS="-D DEFAULT_VHOST -D PHP5 -D SSL -D SSL_DEFAULT_VHOST -D MANUAL -D INFO -D STATUS -D ERRORDOCS -D LANGUAGE"
+APACHE2_OPTS="-D DEFAULT_VHOST -D PHP -D SSL -D SSL_DEFAULT_VHOST -D MANUAL -D INFO -D STATUS -D ERRORDOCS -D LANGUAGE"
 
 # Extended options for advanced uses of Apache ONLY
 # You don't need to edit these unless you are doing crazy Apache stuff