Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
21786392 mailman.conf needs upgrade for Apache 2.4
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 03 Sep 2015 12:44:05 -0700
changeset 4838 e67200166127
parent 4837 5c4d5a9885cc
child 4839 a7c990e1a20a
21786392 mailman.conf needs upgrade for Apache 2.4
components/mailman/files/mailman.conf file | annotate | diff | comparison | revisions
components/mailman/files/mailman.conf-2.2 file | annotate | diff | comparison | revisions
components/mailman/files/mailman.conf-2.4 file | annotate | diff | comparison | revisions
components/mailman/mailman.p5m file | annotate | diff | comparison | revisions 
--- a/components/mailman/files/mailman.conf	Thu Sep 03 09:24:16 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-Alias		/icons/		"/usr/lib/mailman/icons/"
-Alias		/pipermail/	"/var/mailman/archives/public/"
-ScriptAlias	/mailman/	"/usr/lib/mailman/cgi-bin/"
-
-<Directory "/usr/lib/mailman/cgi-bin">
-    Options Indexes FollowSymLinks ExecCGI
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
-
-<Directory "/usr/lib/mailman/icons">
-    Options Indexes FollowSymLinks
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
-
-<Directory "/var/mailman/archives">
-    Options Indexes FollowSymLinks
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mailman/files/mailman.conf-2.2	Thu Sep 03 12:44:05 2015 -0700
@@ -0,0 +1,24 @@
+Alias		/icons/		"/usr/lib/mailman/icons/"
+Alias		/pipermail/	"/var/mailman/archives/public/"
+ScriptAlias	/mailman/	"/usr/lib/mailman/cgi-bin/"
+
+<Directory "/usr/lib/mailman/cgi-bin">
+    Options Indexes FollowSymLinks ExecCGI
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+<Directory "/usr/lib/mailman/icons">
+    Options Indexes FollowSymLinks
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+<Directory "/var/mailman/archives">
+    Options Indexes FollowSymLinks
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mailman/files/mailman.conf-2.4	Thu Sep 03 12:44:05 2015 -0700
@@ -0,0 +1,21 @@
+Alias		/icons/		"/usr/lib/mailman/icons/"
+Alias		/pipermail/	"/var/mailman/archives/public/"
+ScriptAlias	/mailman/	"/usr/lib/mailman/cgi-bin/"
+
+<Directory "/usr/lib/mailman/cgi-bin">
+    Options Indexes FollowSymLinks ExecCGI
+    AllowOverride None
+    Require all granted
+</Directory>
+
+<Directory "/usr/lib/mailman/icons">
+    Options Indexes FollowSymLinks
+    AllowOverride None
+    Require all granted
+</Directory>
+
+<Directory "/var/mailman/archives">
+    Options Indexes FollowSymLinks
+    AllowOverride None
+    Require all granted
+</Directory>
--- a/components/mailman/mailman.p5m	Thu Sep 03 09:24:16 2015 -0700
+++ b/components/mailman/mailman.p5m	Thu Sep 03 12:44:05 2015 -0700
@@ -68,8 +68,8 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2014/296
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file mailman.conf path=etc/apache2/2.2/samples-conf.d/mailman.conf
-file mailman.conf path=etc/apache2/2.4/samples-conf.d/mailman.conf
+file mailman.conf-2.2 path=etc/apache2/2.2/samples-conf.d/mailman.conf
+file mailman.conf-2.4 path=etc/apache2/2.4/samples-conf.d/mailman.conf
 file usr/lib/mailman/Mailman/mm_cfg.py path=etc/mailman/mm_cfg.py \
     owner=mailman group=mailman mode=0644 overlay=allow preserve=true
 file usr/lib/mailman/Mailman/mm_cfg.pyc path=etc/mailman/mm_cfg.pyc \
upstream/oracle/userland-gate