From: Paul Wise Date: Wed, 25 Jul 2018 03:40:15 +0000 (+0800) Subject: Do not install the redirect vhosts on www-staging.d.o X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c7311df6f0c524b860ab8738cfffd4b2acfc13bd;p=mirror%2Fdsa-puppet.git 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 c15063763..9291c3d8f 100644 --- 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 40937028b..cce033870 100644 --- 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 afcd63df3..6ad69d962 100644 --- 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 ########### > @@ -323,4 +324,5 @@ Use common-debian-service-ssl debian.org Use common-ssl-HSTS +<%- end -%> # vim:set syn=apache: