From 25a85a8dedc6ab3d111f11ec4a2932a9d13a83a1 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 4 Sep 2016 18:55:55 +0200 Subject: [PATCH] bootstrap update --- modules/roles/manifests/static_mirror.pp | 2 +- .../templates/static-mirroring/vhost/static-vhosts-simple.erb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index c65e673f1..0bed34860 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -96,7 +96,7 @@ class roles::static_mirror { ssl::service { 'security-team.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'www.ports.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } # dn - #ssl::service { 'bootstrap.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'bootstrap.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debaday.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debdeltas.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'micronews.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } 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 79bdd9205..ad829e29a 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -143,8 +143,7 @@ vhost(lines, "incoming.debian.org" , :ssl => true, :ssl_optional => tr vhost(lines, "incoming.ports.debian.org" , :ssl => true, :ssl_optional => true) vhost(lines, "debdeltas.debian.net" , :ssl => true, :ssl_optional => true) vhost(lines, "news.debian.net" , :ssl => true) -#vhost(lines, "bootstrap.debian.net" , :ssl => true) -vhost(lines, "bootstrap.debian.net" ) +vhost(lines, "bootstrap.debian.net" , :ssl => true) vhost(lines, "debaday.debian.net" , :ssl => true) vhost(lines, "timeline.debian.net" , :ssl => true) vhost(lines, "network-test.debian.org" , :extra => true) -- 2.20.1