From 48cf1d7f51154072c1648b9f34453eb93a83e9ea Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 11 Feb 2017 14:33:06 +0100 Subject: [PATCH] mirror-master static component --- hieradata/common.yaml | 1 + modules/roles/manifests/static_mirror.pp | 4 +++- modules/roles/misc/static-components.yaml | 3 +++ .../templates/static-mirroring/vhost/static-vhosts-simple.erb | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index bf9a3ebb3..e94ef9b9b 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -162,6 +162,7 @@ roles: - lindsay.debian.org - manziarly.debian.org - mekeel.debian.org + - melartin.debian.org - porta.debian.org - philp.debian.org - respighi.debian.org diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index d92bd4d2e..0c49faa08 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -107,6 +107,7 @@ class roles::static_mirror { ssl::service { 'incoming.ports.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'lintian.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'manpages.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'mirror-master.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'onion.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'release.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'rtc.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true } @@ -154,8 +155,9 @@ class roles::static_mirror { onion::service { 'blends.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'incoming.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'incoming.ports.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } - onion::service { 'manpages.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'lintian.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'manpages.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'mirror-master.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'onion.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'release.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'security-team.debian.org' : 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 819763f00..8817cd9b0 100644 --- a/modules/roles/misc/static-components.yaml +++ b/modules/roles/misc/static-components.yaml @@ -48,6 +48,9 @@ components: micronews.debian.org: master: dillon.debian.org source: dillon.debian.org:/srv/micronews.debian.org/htdocs + mirror-master.debian.org: + master: dillon.debian.org + source: melartin.debian.org:/srv/mirror-team.debian.org/htdocs news.debian.net: master: dillon.debian.org source: dillon.debian.org:/srv/news.debian.net/htdocs 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 2765157d2..57aef1545 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -199,6 +199,7 @@ vhost(lines, "appstream.debian.org" , :ssl => true) vhost(lines, "apt.buildd.debian.org" , :ssl => true) vhost(lines, "dsa.debian.org" , :ssl => true) vhost(lines, "rtc.debian.org" , :ssl => true) +vhost(lines, "mirror-master.debian.org" , :ssl => true) vhost(lines, "onion.debian.org" , :ssl => true) vhost(lines, "manpages.debian.org" , :ssl => true, :extra => true) -- 2.20.1