Do not install the redirect vhosts on www-staging.d.o

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index c150637..9291c3d 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -49,6 +49,7 @@ class roles::static_mirror {
                mirror-anu => '150.203.164.62:443 [2001:388:1034:2900::3e]:443',
                default    => '*:443',
        }
+       $redirect_vhosts = true
 
        apache2::config { 'local-static-vhost.conf':
                ensure => absent,

diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index 4093702..cce0338 100644 (file)
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -6,6 +6,7 @@ class roles::www_master {
 
        $vhost_listen = '*:80'
        $vhost_listen_443 = '*:443'
+       $redirect_vhosts = false
        $wwwdo_server_name = 'www-staging.debian.org'
        $wwwdo_document_root = '/srv/www.debian.org/www'
        apache2::site { '005-www-staging.debian.org':

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index afcd63d..6ad69d9 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -302,6 +302,7 @@
 <% end %>
 
 
+<%- if @redirect_vhosts -%>
 # www other
 ###########
 <VirtualHost <%= @vhost_listen %> >
@@ -323,4 +324,5 @@
    Use common-debian-service-ssl debian.org
    Use common-ssl-HSTS
 </VirtualHost>
+<%- end -%>
 # vim:set syn=apache: