[debian-edu-commits] debian-edu/ 01/01: PHP 7.0 transition: Move php-debian-edu.ini from etc/php5/ to etc/php/. Adjust cf/cf.apache2. Adjust Makefile.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 4d095e9e0e11fd33750e20aa96cda43e0b5b2191
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun May 15 23:08:26 2016 +0200

    PHP 7.0 transition: Move php-debian-edu.ini from etc/php5/ to etc/php/. Adjust cf/cf.apache2. Adjust Makefile.
---
 Makefile                                     | 2 +-
 cf/cf.apache2                                | 2 +-
 debian/changelog                             | 4 ++++
 etc/{php5 => php}/apache2/php-debian-edu.ini | 0
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 188b1ae..6fb0d4d 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ SYSCONFFILES = \
 	exim4/exim-ldap-server-v4.conf \
 	filesystems \
 	gosa/gosa.conf \
-	php5/apache2/php-debian-edu.ini \
+	php/apache2/php-debian-edu.ini \
 	insserv/overrides/kdm \
 	insserv/overrides/ntp \
 	ldap/rootDSE-debian-edu.ldif \
diff --git a/cf/cf.apache2 b/cf/cf.apache2
index 5873d77..cdc0c73 100644
--- a/cf/cf.apache2
+++ b/cf/cf.apache2
@@ -1,6 +1,6 @@
 links:
   debian.server.installation::
-    /etc/php5/apache2/php.ini ->! /etc/php5/apache2/php-debian-edu.ini
+    /etc/php/apache2/php.ini ->! /etc/php/apache2/php-debian-edu.ini
 
 shellcommands:
   debian.server.installation::
diff --git a/debian/changelog b/debian/changelog
index 3a6fa9b..4d85edb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,10 @@ debian-edu-config (1.901) UNRELEASED; urgency=medium
     mirror if cdrom is still mounted.
   * Fix ldap2zone configuration, now that upstream changed the defaults and
     dropped the file /etc/default/ldap2zone; adjust Makefile.
+  * PHP 7.0 transition:
+    - Move php-debian-edu.ini from etc/php5/ to etc/php/.
+    - Adjust cf/cf.apache2.
+    - Adjust Makefile.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 14 Apr 2016 23:32:10 +0200
 
diff --git a/etc/php5/apache2/php-debian-edu.ini b/etc/php/apache2/php-debian-edu.ini
similarity index 100%
rename from etc/php5/apache2/php-debian-edu.ini
rename to etc/php/apache2/php-debian-edu.ini

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git