From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 23 Aug 2016 11:47:40 +0000 (+0200)
Subject: web for debconf16 static component
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7997b09aa6fcd6bb60ed9b82b1bce4247589a187;p=mirror%2Fdsa-puppet.git

web for debconf16 static component
---

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 178d59c0e..7eadb9f8b 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -108,6 +108,7 @@ class roles::static_mirror {
 	ssl::service { 'debconf5.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'debconf6.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'debconf7.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'debconf16.debconf.org'         : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { '10years.debconf.org'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'es.debconf.org'                : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'fr.debconf.org'                : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
@@ -148,6 +149,7 @@ class roles::static_mirror {
 		onion::service { 'debconf5.debconf.org'          : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'debconf6.debconf.org'          : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'debconf7.debconf.org'          : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
+		onion::service { 'debconf16.debconf.org'         : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { '10years.debconf.org'           : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'es.debconf.org'                : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'fr.debconf.org'                : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
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 184668b76..7c99f652e 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -165,6 +165,7 @@ vhost(lines, "debconf4.debconf.org", :ssl => true)
 vhost(lines, "debconf5.debconf.org", :ssl => true)
 vhost(lines, "debconf6.debconf.org", :ssl => true)
 vhost(lines, "debconf7.debconf.org", :ssl => true)
+vhost(lines, "debconf16.debconf.org", :ssl => true)
 vhost(lines, "es.debconf.org"      , :ssl => true)
 vhost(lines, "fr.debconf.org"      , :ssl => true)
 vhost(lines, "miniconf10.debconf.org" , :ssl => true)