From 65110a2992a5e87b1142c71b9528ad84f6d47a61 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 4 Sep 2016 16:37:01 +0200 Subject: [PATCH] add bootstrap (no cert yet) --- modules/roles/manifests/static_mirror.pp | 2 ++ modules/roles/misc/static-components.yaml | 3 +++ .../templates/static-mirroring/vhost/static-vhosts-simple.erb | 2 ++ 3 files changed, 7 insertions(+) diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index eedb61363..c65e673f1 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -96,6 +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 { '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, } @@ -141,6 +142,7 @@ class roles::static_mirror { onion::service { 'security-team.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'www.ports.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } # dn + onion::service { 'bootstrap.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debaday.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debdeltas.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'micronews.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml index f980c6d37..2c4770a52 100644 --- a/modules/roles/misc/static-components.yaml +++ b/modules/roles/misc/static-components.yaml @@ -19,6 +19,9 @@ components: blends.debian.org: master: dillon.debian.org source: dillon.debian.org:/srv/blends.debian.org/www + boostrap.debian.net: + master: dillon.debian.org + source: boott.debian.org:/srv/bootstrap.debian.net/htdocs d-i.debian.org: master: dillon.debian.org source: dillon.debian.org:/srv/d-i.debian.org/www 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 566cff342..79bdd9205 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -143,6 +143,8 @@ 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, "debaday.debian.net" , :ssl => true) vhost(lines, "timeline.debian.net" , :ssl => true) vhost(lines, "network-test.debian.org" , :extra => true) -- 2.20.1