[apache2] 02/03: a2enconf/a2disconf in setup-instance

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apache2.

commit b60e9990db83767a14f5652e3d5e5d9d1c8dd429
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Mar 15 10:39:25 2015 +0100

    a2enconf/a2disconf in setup-instance
---
 debian/changelog      | 2 ++
 debian/setup-instance | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f572a0c..a26221c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ apache2 (2.4.10-10) UNRELEASED; urgency=medium
 
   * CVE-2015-0228: mod_lua: Fix denial of service vulnerability in
     wsupgrade().
+  * Fix setup-instance example script to handle a2enconf/a2disconf.
+    LP: #1430936
   * Tweak mention of mod_access_compat in NEWS.Debian. The module does
     not really work in practice.
 
diff --git a/debian/setup-instance b/debian/setup-instance
index adf7d3b..2c8e499 100644
--- a/debian/setup-instance
+++ b/debian/setup-instance
@@ -25,7 +25,7 @@ perl -p -i -e s,XXX,$SUFFIX, /etc/init.d/apache2-$SUFFIX
 chmod 755 /etc/init.d/apache2-$SUFFIX
 
 echo -n Setting up symlinks: 
-for a in a2enmod a2dismod a2ensite a2dissite apache2ctl ; do
+for a in a2enmod a2dismod a2ensite a2dissite a2enconf a2disconf apache2ctl ; do
 	echo -n " $a-$SUFFIX"
 	ln -s /usr/sbin/$a /usr/local/sbin/$a-$SUFFIX
 done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git