aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/websites/templates
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-04-14 14:38:33 +0000
committerNicolas Vigier <boklm@mageia.org>2013-04-14 14:38:33 +0000
commit54f432cfe5483fc38bda45907970b0e46685192d (patch)
treeced92697c1d776c84cc7e25dd17539cf06929ebf /deployment/websites/templates
parentbcc4ea357e26c176a494f7bdf06491ddcd6c7dc3 (diff)
downloadpuppet-54f432cfe5483fc38bda45907970b0e46685192d.tar
puppet-54f432cfe5483fc38bda45907970b0e46685192d.tar.gz
puppet-54f432cfe5483fc38bda45907970b0e46685192d.tar.bz2
puppet-54f432cfe5483fc38bda45907970b0e46685192d.tar.xz
puppet-54f432cfe5483fc38bda45907970b0e46685192d.zip
websites: rewrite mailman urls
Diffstat (limited to 'deployment/websites/templates')
-rw-r--r--deployment/websites/templates/vhost_proxy_mailman.conf2
-rw-r--r--deployment/websites/templates/vhost_proxy_mailman_ssl.conf2
-rw-r--r--deployment/websites/templates/vhost_www_rewrite.conf11
3 files changed, 13 insertions, 2 deletions
diff --git a/deployment/websites/templates/vhost_proxy_mailman.conf b/deployment/websites/templates/vhost_proxy_mailman.conf
index ef447f9c..a65a244a 100644
--- a/deployment/websites/templates/vhost_proxy_mailman.conf
+++ b/deployment/websites/templates/vhost_proxy_mailman.conf
@@ -7,7 +7,7 @@ ProxyPreserveHost On
Allow from all
</Proxy>
-<% for u in ['/mailman/','/pipermail/'] %>
+<% for u in ['/pipermail/'] %>
ProxyPass <%= u %> http://ryu.zarb.org<%= u %>
ProxyPassReverse <%= u %> http://ryu.zarb.org<%= u %>
diff --git a/deployment/websites/templates/vhost_proxy_mailman_ssl.conf b/deployment/websites/templates/vhost_proxy_mailman_ssl.conf
index e5fcfbe1..b662c16b 100644
--- a/deployment/websites/templates/vhost_proxy_mailman_ssl.conf
+++ b/deployment/websites/templates/vhost_proxy_mailman_ssl.conf
@@ -9,7 +9,7 @@ ProxyPreserveHost On
SSLProxyEngine On
-<% for u in ['/mailman/','/pipermail/'] %>
+<% for u in ['/pipermail/'] %>
ProxyPass <%= u %> https://ryu.zarb.org<%= u %>
ProxyPassReverse <%= u %> https://ryu.zarb.org<%= u %>
diff --git a/deployment/websites/templates/vhost_www_rewrite.conf b/deployment/websites/templates/vhost_www_rewrite.conf
new file mode 100644
index 00000000..76a6f022
--- /dev/null
+++ b/deployment/websites/templates/vhost_www_rewrite.conf
@@ -0,0 +1,11 @@
+RewriteEngine On
+RewriteRule ^/mailman/listinfo/mageia-annnounce https://ml.mageia.org/l/info/announce [R=301,L]
+RewriteRule ^/mailman/listinfo/mageia-artwork https://ml.mageia.org/l/info/atelier-discuss [R=301,L]
+RewriteRule ^/mailman/listinfo/mageia-bugsquad https://ml.mageia.org/l/info/bugsquad-discuss [R=301,L]
+RewriteRule ^/mailman/listinfo/mageia-dev https://ml.mageia.org/l/info/dev [R=301,L]
+RewriteRule ^/mailman/listinfo/mageia-discuss https://ml.mageia.org/l/info/discuss [R=301,L]
+RewriteRule ^/mailman/listinfo/mageia-i18n https://ml.mageia.org/l/info/i18n-discuss [R=301,L]
+RewriteRule ^/mailman/listinfo/mageia-marketing https://ml.mageia.org/l/info/atelier-discuss [R=301,L]
+RewriteRule ^/mailman/listinfo/mageia-sysadm https://ml.mageia.org/l/info/sysadmin-discuss [R=301,L]
+RewriteRule ^/mailman/listinfo/mageia-webteam https://ml.mageia.org/l/info/atelier-discuss [R=301,L]
+RewriteRule ^/mailman https://ml.mageia.org/ [R=301,L]