[packages/mailman] - migrated to apache 2.4

baggins baggins at pld-linux.org
Wed May 15 22:40:14 CEST 2013


commit 5938fae8979a1dac9b1103a36f63ea35106c1fc2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 22:40:13 2013 +0200

    - migrated to apache 2.4

 mailman.conf => mailman-apache.conf |  0
 mailman-httpd.conf                  | 52 +++++++++++++++++++++++++++++++++++++
 mailman.spec                        | 12 +++++----
 3 files changed, 59 insertions(+), 5 deletions(-)
---
diff --git a/mailman.spec b/mailman.spec
index 96d69b9..1c6b87e 100644
--- a/mailman.spec
+++ b/mailman.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_with	umbrella_hack	# break anonimization (for use with moderated umbrella list of moderated lists)
 
-%define		rel	5
+%define		rel	6
 Summary:	The GNU Mailing List Management System
 Summary(es.UTF-8):	El Sistema de Mantenimiento de listas de GNU
 Summary(pl.UTF-8):	System Zarządzania Listami Pocztowymi GNU
@@ -17,13 +17,14 @@ Source0:	http://downloads.sourceforge.net/mailman/%{name}-%{version}.tgz
 # Source0-md5:	9ea163871ceccbd33fee4c9e335fcf7b
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
 # Source1-md5:	6b55f9f8051c76961b84a12ed17fc14f
-Source2:	%{name}.conf
+Source2:	%{name}-apache.conf
 Source3:	%{name}.init
 Source4:	%{name}.sysconfig
 Source5:	%{name}.logrotate
 Source6:	add_nonmembers
 Source7:	subscribe_list
 Source8:	%{name}.tmpfiles
+Source9:	%{name}-httpd.conf
 Patch0:		%{name}-MM_FIND_GROUP_NAME.patch
 Patch1:		%{name}-dont-send-broken-reminder-ugly-hack.patch
 Patch2:		%{name}-mailmanctl-status.patch
@@ -71,6 +72,7 @@ Provides:	group(mailman)
 Provides:	user(mailman)
 # for converting text/html into plain text in default configuration:
 Suggests:	lynx
+Conflicts:	apache-base < 2.4.0-1
 Conflicts:	logrotate < 3.8.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -234,7 +236,7 @@ export PYTHONPATH=$RPM_BUILD_ROOT%{_libdir}/%{name}:$RPM_BUILD_ROOT%{_libdir}/%{
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-sed -e 's#/usr/lib/mailman#%{_libdir}/mailman#g' %{SOURCE2} \
+sed -e 's#/usr/lib/mailman#%{_libdir}/mailman#g' %{SOURCE9} \
 	> $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 sed -e 's#/usr/lib/mailman#%{_libdir}/mailman#g' %{SOURCE2} \
 	> $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -363,10 +365,10 @@ fi
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- mailman < 1:2.1.7-2.1
diff --git a/mailman.conf b/mailman-apache.conf
similarity index 100%
rename from mailman.conf
rename to mailman-apache.conf
diff --git a/mailman-httpd.conf b/mailman-httpd.conf
new file mode 100644
index 0000000..78ef2a5
--- /dev/null
+++ b/mailman-httpd.conf
@@ -0,0 +1,52 @@
+Alias /mailman/pipermail/ /var/lib/mailman/archives/public/
+
+<Directory /var/lib/mailman/archives/public>
+	Options Indexes MultiViews FollowSymLinks
+	AllowOverride None
+	Require all granted
+</Directory>
+
+Alias /mailman/icons/ /usr/lib/mailman/icons/
+<Directory /usr/lib/mailman/icons/>
+	AllowOverride None
+	Require all granted
+</Directory>
+
+ScriptAlias /mailman/ /usr/lib/mailman/cgi-bin/
+
+<Directory /usr/lib/mailman/cgi-bin/>
+	Options ExecCGI
+	AllowOverride None
+	AddHandler cgi-script .cgi
+	Require all granted
+
+# Enable this section to use HTTP auth instead of adm.pw
+# NOTE: you won't be able to authorize with list password anymore.
+#	# Authorize as admin via HTTP auth
+#	<Files ~ "(admin|admindb|create)">
+#		# File based Authz
+#	   AuthUserFile /etc/webapps/mailman/htpasswd
+#
+#	   # LDAP based Authz. Apache 1.3
+#	   <IfModule mod_auth_ldap.c>
+#		   AuthLDAPEnabled on
+#		   AuthLDAPURL ldap://localhost/ou=People,dc=example,dc=org?uid?sub?(objectClass=*)
+#	   </IfModule>
+#
+#	   # LDAP based Authz. Apache 2.x
+#		<IfModule authnz_ldap_module>
+#			AuthLDAPURL ldap://localhost/ou=People,dc=example,dc=org?uid?one
+#			AuthzLDAPAuthoritative off
+#			AuthBasicProvider ldap
+#		</IfModule>
+#
+#		AuthType Basic
+#		AuthName "MailMan"
+#		Require valid-user
+#	</Files>
+</Directory>
+
+# Uncomment the following line, replacing www.example.com with your server's
+# name, to redirect queries to /mailman to the listinfo page (recommended).
+
+# RedirectMatch ^/mailman[/]*$ http://www.example.com/mailman/listinfo
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mailman.git/commitdiff/5938fae8979a1dac9b1103a36f63ea35106c1fc2



More information about the pld-cvs-commit mailing list