[debian-edu-commits] debian-edu/ 01/01: Correct cfengine rule for apache, disable default site using new name 000-default.conf, instead of old and now obsolete name default.

[Petter Reinholdtsen]

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

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

commit 713e415f047db1978432a81d86896a6427dc5adf
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Sep 26 13:52:52 2014 +0200

    Correct cfengine rule for apache, disable default site using new name 000-default.conf, instead of old and now obsolete name default.
---
 cf/cf.apache2    | 2 +-
 debian/changelog | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cf/cf.apache2 b/cf/cf.apache2
index 856a953..6801af2 100644
--- a/cf/cf.apache2
+++ b/cf/cf.apache2
@@ -18,7 +18,7 @@ shellcommands:
       "/usr/sbin/a2enmod cgi"
       "/usr/sbin/a2enconf sitesummary.conf"
       # Disable the stock debian sitefile
-      "/usr/sbin/a2dissite default"
+      "/usr/sbin/a2dissite 000-default.conf"
       # Reload apache2 for changes to take effect
       "/usr/sbin/invoke-rc.d apache2 force-reload"
 
diff --git a/debian/changelog b/debian/changelog
index cdf1693..5470a64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ debian-edu-config (1.806) UNRELEASED; urgency=low
   [ Petter Reinholdtsen ]
   * Extend testsuite/taskpkgs to also check that the correct desktop
     task was activated.
+  * Correct cfengine rule for apache, disable default site using new
+    name 000-default.conf, instead of old and now obsolete name default.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 25 Sep 2014 23:56:27 +0200
 

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