From: Peter Palfrader Date: Wed, 1 Jan 2014 21:53:42 +0000 (+0100) Subject: Move volatile vhost from www to static X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9ad4acf729fd2f69e2e358c67be24efe13f588b7;p=mirror%2Fdsa-puppet.git Move volatile vhost from www to static --- diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb index 7775d9685..a4a4e8dc2 100644 --- a/modules/roles/templates/apache-www.debian.org.erb +++ b/modules/roles/templates/apache-www.debian.org.erb @@ -245,13 +245,3 @@ RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301] - - - > - ServerName volatile.debian.org - ServerAlias volatile-master.debian.org - ServerAdmin webmaster@debian.org - ErrorLog /var/log/apache2/volatile.debian.org-error.log - CustomLog /var/log/apache2/volatile.debian.org-access.log privacy - RedirectMatch permanent . http://www.debian.org/volatile/ - diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb index 1da1eb598..672726a00 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -88,4 +88,11 @@ Use common-static-vhost-ssl dsa.debian.org RedirectPermanent / http://www.ports.debian.org/ + > + ServerName volatile.debian.org + ServerAlias volatile-master.debian.org + ServerAdmin debian-admin@debian.org + RedirectPermanent / http://www.debian.org/volatile/ + + # vim:ft=apache: