From 2d649ef7562cf9f87bee0958b2fd4fabbc80cb09 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 24 May 2015 15:48:15 +0200
Subject: Migrate mailman snippets to Jessie Apache2.4 syntax. Fix avoid access
 to private mailman archives.

---
 apache2/conf-available/local-mailman-nonroot.conf |  3 +++
 apache2/conf-available/local-mailman-root.conf    | 13 +++++++++++++
 apache2/conf-available/local-mailman.conf         | 12 ++++++++++++
 apache2/conf.d/local-mailman-nonroot.conf         |  3 ---
 apache2/conf.d/local-mailman-root.conf            | 13 -------------
 apache2/conf.d/local-mailman.conf                 | 14 --------------
 6 files changed, 28 insertions(+), 30 deletions(-)
 create mode 100644 apache2/conf-available/local-mailman-nonroot.conf
 create mode 100644 apache2/conf-available/local-mailman-root.conf
 create mode 100644 apache2/conf-available/local-mailman.conf
 delete mode 100644 apache2/conf.d/local-mailman-nonroot.conf
 delete mode 100644 apache2/conf.d/local-mailman-root.conf
 delete mode 100644 apache2/conf.d/local-mailman.conf

diff --git a/apache2/conf-available/local-mailman-nonroot.conf b/apache2/conf-available/local-mailman-nonroot.conf
new file mode 100644
index 0000000..5fb2e62
--- /dev/null
+++ b/apache2/conf-available/local-mailman-nonroot.conf
@@ -0,0 +1,3 @@
+ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
+
+RedirectMatch permanent ^/mailman/?$ /mailman/listinfo
diff --git a/apache2/conf-available/local-mailman-root.conf b/apache2/conf-available/local-mailman-root.conf
new file mode 100644
index 0000000..b108171
--- /dev/null
+++ b/apache2/conf-available/local-mailman-root.conf
@@ -0,0 +1,13 @@
+ScriptAlias /admin /usr/lib/cgi-bin/mailman/admin
+ScriptAlias /admindb /usr/lib/cgi-bin/mailman/admindb
+ScriptAlias /confirm /usr/lib/cgi-bin/mailman/confirm
+ScriptAlias /create /usr/lib/cgi-bin/mailman/create
+ScriptAlias /edithtml /usr/lib/cgi-bin/mailman/edithtml
+ScriptAlias /listinfo /usr/lib/cgi-bin/mailman/listinfo
+ScriptAlias /options /usr/lib/cgi-bin/mailman/options
+ScriptAlias /private /usr/lib/cgi-bin/mailman/private
+ScriptAlias /rmlist /usr/lib/cgi-bin/mailman/rmlist
+ScriptAlias /roster /usr/lib/cgi-bin/mailman/roster
+ScriptAlias /subscribe /usr/lib/cgi-bin/mailman/subscribe
+
+RedirectMatch permanent ^/$ /listinfo
diff --git a/apache2/conf-available/local-mailman.conf b/apache2/conf-available/local-mailman.conf
new file mode 100644
index 0000000..72fb945
--- /dev/null
+++ b/apache2/conf-available/local-mailman.conf
@@ -0,0 +1,12 @@
+<Directory /var/lib/mailman/archives/public>
+	Options Indexes FollowSymLinks
+	AllowOverride None
+	Require all granted
+</Directory>
+
+<Directory /usr/share/images/mailman/>
+	Require all granted
+</Directory>
+
+Alias /pipermail/ /var/lib/mailman/archives/public/
+Alias /images/mailman/ /usr/share/images/mailman/
diff --git a/apache2/conf.d/local-mailman-nonroot.conf b/apache2/conf.d/local-mailman-nonroot.conf
deleted file mode 100644
index 5fb2e62..0000000
--- a/apache2/conf.d/local-mailman-nonroot.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
-
-RedirectMatch permanent ^/mailman/?$ /mailman/listinfo
diff --git a/apache2/conf.d/local-mailman-root.conf b/apache2/conf.d/local-mailman-root.conf
deleted file mode 100644
index b108171..0000000
--- a/apache2/conf.d/local-mailman-root.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-ScriptAlias /admin /usr/lib/cgi-bin/mailman/admin
-ScriptAlias /admindb /usr/lib/cgi-bin/mailman/admindb
-ScriptAlias /confirm /usr/lib/cgi-bin/mailman/confirm
-ScriptAlias /create /usr/lib/cgi-bin/mailman/create
-ScriptAlias /edithtml /usr/lib/cgi-bin/mailman/edithtml
-ScriptAlias /listinfo /usr/lib/cgi-bin/mailman/listinfo
-ScriptAlias /options /usr/lib/cgi-bin/mailman/options
-ScriptAlias /private /usr/lib/cgi-bin/mailman/private
-ScriptAlias /rmlist /usr/lib/cgi-bin/mailman/rmlist
-ScriptAlias /roster /usr/lib/cgi-bin/mailman/roster
-ScriptAlias /subscribe /usr/lib/cgi-bin/mailman/subscribe
-
-RedirectMatch permanent ^/$ /listinfo
diff --git a/apache2/conf.d/local-mailman.conf b/apache2/conf.d/local-mailman.conf
deleted file mode 100644
index 146900a..0000000
--- a/apache2/conf.d/local-mailman.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-<Directory /var/lib/mailman/archives/>
-	Options Indexes FollowSymLinks
-	AllowOverride None
-	order deny,allow
-	allow from all
-</Directory>
-
-<Directory /usr/share/images/mailman/>
-	order deny,allow
-	allow from all
-</Directory>
-
-Alias /pipermail/ /var/lib/mailman/archives/public/
-Alias /images/mailman/ /usr/share/images/mailman/
-- 
cgit v1.2.3