From 8604bd193412c0bf604d8b8e38b76d0e350f107c Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 20 Aug 2014 12:30:17 +0100
Subject: [PATCH] Use apache 2.4 style access controls

---
 cookbooks/cgiirc/templates/default/apache.erb  | 5 +++++
 cookbooks/dns/templates/default/apache.erb     | 4 ++++
 cookbooks/mailman/templates/default/apache.erb | 3 ++-
 cookbooks/trac/templates/default/apache.erb    | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/cookbooks/cgiirc/templates/default/apache.erb b/cookbooks/cgiirc/templates/default/apache.erb
index ea6ada67b..025892c74 100644
--- a/cookbooks/cgiirc/templates/default/apache.erb
+++ b/cookbooks/cgiirc/templates/default/apache.erb
@@ -13,6 +13,11 @@
 
 	<Directory "/usr/lib/cgi-bin/cgiirc">
 		AddHandler cgi-script .cgi
+		Require all granted
+	</Directory>
+
+	<Directory "/usr/share/images/cgiirc">
+		Require all granted
 	</Directory>
 
 	<IfModule mod_deflate.c>
diff --git a/cookbooks/dns/templates/default/apache.erb b/cookbooks/dns/templates/default/apache.erb
index 478ca4262..31f8eebae 100644
--- a/cookbooks/dns/templates/default/apache.erb
+++ b/cookbooks/dns/templates/default/apache.erb
@@ -10,3 +10,7 @@
 	DocumentRoot <%= @directory %>/html
 	Alias /json/ /var/lib/dns/json/
 </VirtualHost>
+
+<Directory <%= @directory %>/html>
+	Require all granted
+</Directory>
diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 7e4007962..2262c3fa2 100644
--- a/cookbooks/mailman/templates/default/apache.erb
+++ b/cookbooks/mailman/templates/default/apache.erb
@@ -36,6 +36,7 @@
 	<Directory /var/lib/mailman/archives/>
 		Options Indexes FollowSymLinks
 		AllowOverride None
+		Require all granted
 	</Directory>
 
 	Alias /pipermail/ /var/lib/mailman/archives/public/
@@ -54,7 +55,7 @@
 	ScriptAlias /subscribe /usr/lib/cgi-bin/mailman/subscribe
 	ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
 
-	<Location ~ "/pipermail/([^/]+)/(2004|2005|2006|2007|2008|2009)">
+	<Location ~ "/pipermail/([^/]+)/(2004|2005|2006|2007|2008|2009|2010|2011|2012|2013|2014)">
 		ExpiresActive On
 		ExpiresDefault "access plus 180 days"
 	</Location>
diff --git a/cookbooks/trac/templates/default/apache.erb b/cookbooks/trac/templates/default/apache.erb
index 255ed18dd..f56b9e837 100644
--- a/cookbooks/trac/templates/default/apache.erb
+++ b/cookbooks/trac/templates/default/apache.erb
@@ -37,3 +37,7 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> maximum-req
 		Require valid-user
 	</Location>
 </VirtualHost>
+
+<Directory <%= @directory %>/htdocs>
+	Require all granted
+</Directory>
-- 
2.43.2