diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 14:58:03 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 14:58:03 +0000 |
| commit | 0af0ba047844a802afcbed8aab2cb5df130e156e (patch) | |
| tree | 32a3525dba44ca9c940a62052372498bf18f591e /deployment/websites | |
| parent | 54f432cfe5483fc38bda45907970b0e46685192d (diff) | |
| download | puppet-0af0ba047844a802afcbed8aab2cb5df130e156e.tar puppet-0af0ba047844a802afcbed8aab2cb5df130e156e.tar.gz puppet-0af0ba047844a802afcbed8aab2cb5df130e156e.tar.bz2 puppet-0af0ba047844a802afcbed8aab2cb5df130e156e.tar.xz puppet-0af0ba047844a802afcbed8aab2cb5df130e156e.zip | |
websites: rewrite pipermail URLs
Diffstat (limited to 'deployment/websites')
| -rw-r--r-- | deployment/websites/manifests/www.pp | 6 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_proxy_mailman.conf | 14 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_proxy_mailman_ssl.conf | 16 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_www_rewrite.conf | 11 |
4 files changed, 13 insertions, 34 deletions
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp index 3a4d2dc5..9787af18 100644 --- a/deployment/websites/manifests/www.pp +++ b/deployment/websites/manifests/www.pp @@ -24,8 +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'), + 'websites/vhost_www_rewrite.conf'), location => $vhostdir, options => ['FollowSymLinks'], } @@ -34,8 +33,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'), + 'websites/vhost_www_rewrite.conf'), location => $vhostdir, options => ['FollowSymLinks'], } diff --git a/deployment/websites/templates/vhost_proxy_mailman.conf b/deployment/websites/templates/vhost_proxy_mailman.conf deleted file mode 100644 index a65a244a..00000000 --- a/deployment/websites/templates/vhost_proxy_mailman.conf +++ /dev/null @@ -1,14 +0,0 @@ - -ProxyRequests Off -ProxyPreserveHost On - -<Proxy *> - Order deny,allow - Allow from all -</Proxy> - -<% for u in ['/pipermail/'] %> -ProxyPass <%= u %> http://ryu.zarb.org<%= u %> -ProxyPassReverse <%= u %> http://ryu.zarb.org<%= u %> - -<% end %> diff --git a/deployment/websites/templates/vhost_proxy_mailman_ssl.conf b/deployment/websites/templates/vhost_proxy_mailman_ssl.conf deleted file mode 100644 index b662c16b..00000000 --- a/deployment/websites/templates/vhost_proxy_mailman_ssl.conf +++ /dev/null @@ -1,16 +0,0 @@ - -ProxyRequests Off -ProxyPreserveHost On - -<Proxy *> - Order deny,allow - Allow from all -</Proxy> - -SSLProxyEngine On - -<% for u in ['/pipermail/'] %> -ProxyPass <%= u %> https://ryu.zarb.org<%= u %> -ProxyPassReverse <%= u %> https://ryu.zarb.org<%= u %> - -<% end %> diff --git a/deployment/websites/templates/vhost_www_rewrite.conf b/deployment/websites/templates/vhost_www_rewrite.conf index 76a6f022..f1fa607e 100644 --- a/deployment/websites/templates/vhost_www_rewrite.conf +++ b/deployment/websites/templates/vhost_www_rewrite.conf @@ -9,3 +9,14 @@ RewriteRule ^/mailman/listinfo/mageia-marketing https://ml.mageia.org/l/info/ate 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] + +RewriteRule ^/pipermail/mageia-announce/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-announce/$1 [R=301,L] +RewriteRule ^/pipermail/mageia-artwork/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-artwork/$1 [R=301,L] +RewriteRule ^/pipermail/mageia-bugsquad/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-bugsquad/$1 [R=301,L] +RewriteRule ^/pipermail/mageia-dev/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-dev/$1 [R=301,L] +RewriteRule ^/pipermail/mageia-discuss/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-discuss/$1 [R=301,L] +RewriteRule ^/pipermail/mageia-i18n/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-i18n/$1 [R=301,L] +RewriteRule ^/pipermail/mageia-marketing/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-marketing/$1 [R=301,L] +RewriteRule ^/pipermail/mageia-sysadm/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-sysadm/$1 [R=301,L] +RewriteRule ^/pipermail/mageia-webteam/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-webteam/$1 [R=301,L] +RewriteRule ^/pipermail http://archives.mageia.org/zarb-ml/ [R=301,L] |