From d2dc75f5b2d9f82b95734116be9af3ee4c443216 Mon Sep 17 00:00:00 2001 From: Christian Bayle Date: Fri, 2 Apr 2010 16:19:12 +0000 Subject: [PATCH] Try to add proper apache config --- .gitattributes | 5 ++ .../coclico/mailman/etc/httpd.d/200list.vhost | 4 ++ plugins/coclico/mailman/etc/httpd.d/20list | 18 +++++++ .../coclico/mailman/etc/httpd.d/20zlist.vhost | 14 ++++++ .../mailman/etc/httpd.d/21list.vhost.ssl | 47 +++++++++++++++++++ .../mailman/etc/httpd.d/62plugin-list-mailman | 18 +++++++ .../mailman/packaging/install/plugin-mailman | 1 + 7 files changed, 107 insertions(+) create mode 100644 plugins/coclico/mailman/etc/httpd.d/200list.vhost create mode 100644 plugins/coclico/mailman/etc/httpd.d/20list create mode 100644 plugins/coclico/mailman/etc/httpd.d/20zlist.vhost create mode 100644 plugins/coclico/mailman/etc/httpd.d/21list.vhost.ssl create mode 100644 plugins/coclico/mailman/etc/httpd.d/62plugin-list-mailman diff --git a/.gitattributes b/.gitattributes index d1a02b634b..4e4caf1508 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3938,6 +3938,11 @@ plugins/coclico/mailman/debian/docs -text plugins/coclico/mailman/debian/po/templates.pot -text plugins/coclico/mailman/debian/rules -text plugins/coclico/mailman/debian/source/format -text +plugins/coclico/mailman/etc/httpd.d/200list.vhost -text +plugins/coclico/mailman/etc/httpd.d/20list -text +plugins/coclico/mailman/etc/httpd.d/20zlist.vhost -text +plugins/coclico/mailman/etc/httpd.d/21list.vhost.ssl -text +plugins/coclico/mailman/etc/httpd.d/62plugin-list-mailman -text plugins/coclico/mailman/etc/plugins/mailman/config.php -text plugins/coclico/mailman/include/BackendMailmanList.class.php -text plugins/coclico/mailman/include/MailmanList.class.php -text diff --git a/plugins/coclico/mailman/etc/httpd.d/200list.vhost b/plugins/coclico/mailman/etc/httpd.d/200list.vhost new file mode 100644 index 0000000000..14a171aed8 --- /dev/null +++ b/plugins/coclico/mailman/etc/httpd.d/200list.vhost @@ -0,0 +1,4 @@ +# 200list.vhost begin + + ServerName {lists_host} +# 200list.vhost end diff --git a/plugins/coclico/mailman/etc/httpd.d/20list b/plugins/coclico/mailman/etc/httpd.d/20list new file mode 100644 index 0000000000..c7c2d07987 --- /dev/null +++ b/plugins/coclico/mailman/etc/httpd.d/20list @@ -0,0 +1,18 @@ +# 20list begin + AddHandler cgi-script .cgi + + ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/ + ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/ + + Alias /pipermail /var/lib/mailman/archives/public + + AllowOverride Options + Options FollowSymLinks + + + Alias /images/mailman /usr/share/images/mailman + + order allow,deny + allow from all + +# 20list end diff --git a/plugins/coclico/mailman/etc/httpd.d/20zlist.vhost b/plugins/coclico/mailman/etc/httpd.d/20zlist.vhost new file mode 100644 index 0000000000..cfa4fae6ca --- /dev/null +++ b/plugins/coclico/mailman/etc/httpd.d/20zlist.vhost @@ -0,0 +1,14 @@ +# 20zlist.vhost begin + RedirectMatch permanent ^/$ http://{lists_host}/mailman/listinfo + LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge + CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/fusionforge-lists.log" fusionforge + # Ensure that we don't try to use SSL on SSL Servers + + SSLDisable + + + RewriteEngine on + RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK) + RewriteRule .* - [F] + +# 20zlist.vhost end diff --git a/plugins/coclico/mailman/etc/httpd.d/21list.vhost.ssl b/plugins/coclico/mailman/etc/httpd.d/21list.vhost.ssl new file mode 100644 index 0000000000..c132c14956 --- /dev/null +++ b/plugins/coclico/mailman/etc/httpd.d/21list.vhost.ssl @@ -0,0 +1,47 @@ +# 21list.vhost.ssl begin + + ServerName {lists_host} + + + SSLEngine on + SSLCertificateFile {sys_sslcrt} + SSLCertificateKeyFile {sys_sslkey} + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown + + + + SSLEnable + + ##### COPY 20list begin ##### + AddHandler cgi-script .cgi + + ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/ + ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/ + + Alias /pipermail /var/lib/mailman/archives/public + + AllowOverride Options + Options FollowSymLinks + + + Alias /images/mailman /usr/share/images/mailman + + order allow,deny + allow from all + + ##### COPY 20list end ##### + RedirectMatch permanent ^/$ https://{lists_host}/mailman/listinfo + LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge + CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/fusionforge-list-ssl.log" fusionforge + + RewriteEngine on + RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK) + RewriteRule .* - [F] + +# 21list.vhost.ssl end diff --git a/plugins/coclico/mailman/etc/httpd.d/62plugin-list-mailman b/plugins/coclico/mailman/etc/httpd.d/62plugin-list-mailman new file mode 100644 index 0000000000..64e743d822 --- /dev/null +++ b/plugins/coclico/mailman/etc/httpd.d/62plugin-list-mailman @@ -0,0 +1,18 @@ +# 62plugin-list-mailman begin + AddHandler cgi-script .cgi + + ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/ + ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/ + + Alias /pipermail /var/lib/mailman/archives/public + + AllowOverride Options + Options FollowSymLinks + + + Alias /images/mailman /usr/share/images/mailman + + order allow,deny + allow from all + +# 62plugin-list-mailman end diff --git a/plugins/coclico/mailman/packaging/install/plugin-mailman b/plugins/coclico/mailman/packaging/install/plugin-mailman index 8c6d65957f..e6bba5a257 100644 --- a/plugins/coclico/mailman/packaging/install/plugin-mailman +++ b/plugins/coclico/mailman/packaging/install/plugin-mailman @@ -5,5 +5,6 @@ bin/* usr/share/gforge/plugins/mailman/bin/ www/* usr/share/gforge/plugins/mailman/www/ cronjobs/* usr/share/gforge/cronjobs etc/plugins/mailman/* etc/gforge/plugins/mailman/ +etc/httpd.d/* usr/share/gforge/etc/httpd.d/ usr/lib/mailman/Mailman/* usr/lib/mailman/Mailman/ var/lib/mailman/lists/* var/lib/mailman/lists/ -- 2.30.2