diff options
4 files changed, 15 insertions, 2 deletions
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp index 9086c3af..3a4d2dc5 100644 --- a/deployment/websites/manifests/www.pp +++ b/deployment/websites/manifests/www.pp @@ -24,6 +24,7 @@ class websites::www { apache::vhost::base { $vhost: content => template('websites/vhost_www.conf', + 'websites/vhost_www_rewrite.conf', 'websites/vhost_proxy_mailman.conf'), location => $vhostdir, options => ['FollowSymLinks'], @@ -33,6 +34,7 @@ class websites::www { use_ssl => true, vhost => $vhost, content => template('websites/vhost_www.conf', + 'websites/vhost_www_rewrite.conf', 'websites/vhost_proxy_mailman_ssl.conf'), location => $vhostdir, options => ['FollowSymLinks'], 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] |