[Piuparts-commits] [piuparts] 06/07: Adapt and rename conf/piuparts.apache to piuparts-master.conf as per apache2.4 transition. (Closes: #712384)

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit 831250ba9628d834b3c4f8b9350dd48ba82e6241
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Feb 18 00:03:18 2014 +0100

    Adapt and rename conf/piuparts.apache to piuparts-master.conf as per apache2.4 transition. (Closes: #712384)
---
 Makefile                                       | 4 ++--
 conf/{piuparts.apache => piuparts-master.conf} | 3 +--
 debian/piuparts-master.install                 | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 5eaf7d1..3530ebb 100644
--- a/Makefile
+++ b/Makefile
@@ -100,8 +100,8 @@ install-conf: build-stamp
 	# disable shipped sudoers
 	sed -i -r '/^[^#]+/s/^/#/' $(DESTDIR)$(etcdir)/sudoers.d/piuparts
 
-	install -d $(DESTDIR)$(etcdir)/apache2/conf.d
-	install -m 0644 conf/piuparts.apache $(DESTDIR)$(etcdir)/apache2/conf.d/
+	install -d $(DESTDIR)$(etcdir)/apache2/conf-available
+	install -m 0644 conf/piuparts-master.conf $(DESTDIR)$(etcdir)/apache2/conf-available/
 
 install-conf-4-running-from-git: build-stamp
 	install -d $(DESTDIR)$(etcdir)/piuparts
diff --git a/conf/piuparts.apache b/conf/piuparts-master.conf
similarity index 79%
rename from conf/piuparts.apache
rename to conf/piuparts-master.conf
index 7949d52..3e29a7a 100644
--- a/conf/piuparts.apache
+++ b/conf/piuparts-master.conf
@@ -1,8 +1,7 @@
 Alias /piuparts /var/lib/piuparts/htdocs
 
 <Directory /var/lib/piuparts/htdocs>
-  Order allow,deny
-  Allow from all
+  Require all granted
 
   Options indexes
 
diff --git a/debian/piuparts-master.install b/debian/piuparts-master.install
index be3daca..1c6ab9f 100644
--- a/debian/piuparts-master.install
+++ b/debian/piuparts-master.install
@@ -1,4 +1,4 @@
-etc/apache2/conf.d/piuparts.apache
+etc/apache2/conf-available/piuparts-master.conf
 etc/cron.d/piuparts-master
 #etc/piuparts/known_problems/
 usr/share/piuparts/htdocs/*

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