From 04781beea263e356f8b43b95cdb566b7e32f76df Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 9 Feb 2018 19:32:09 +0100 Subject: [PATCH] Add cdbuilder-logs static component (re: RT##7101) --- modules/roles/manifests/static_mirror.pp | 2 ++ modules/roles/misc/static-components.yaml | 3 +++ .../templates/static-mirroring/vhost/static-vhosts-simple.erb | 1 + modules/sudo/files/sudoers | 1 + 4 files changed, 7 insertions(+) diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index c95d062c5..c3d62e580 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 { 'backports.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'bits.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'blends.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'cdbuilder-logs.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true } ssl::service { 'd-i.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true } ssl::service { 'deb.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true } ssl::service { 'dpl.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true } @@ -160,6 +161,7 @@ class roles::static_mirror { onion::service { 'backports.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'bits.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'blends.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'cdbuilder-logs.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 { 'lintian.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 493c07cc4..f1d3535f4 100644 --- a/modules/roles/misc/static-components.yaml +++ b/modules/roles/misc/static-components.yaml @@ -103,6 +103,9 @@ components: master: dillon.debian.org source: wuiet.debian.org:/srv/buildd.debian.org/ftp-archive/archive limit-mirrors: [ 'klecker.debian.org', 'senfter.debian.org' ] + cdbuilder-logs.debian.org: + master: dillon.debian.org + source: casulana.debian.org:/srv/cdbuilder.debian.org/dst/deb-cd/log 10years.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/10years.debconf.org' } debconf0.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf0.debconf.org' } debconf1.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf1.debconf.org' } 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 43dcd6550..cbdeb36ae 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -213,6 +213,7 @@ vhost(lines, "mirror-master.debian.org" , :ssl => true) vhost(lines, "onion.debian.org" , :ssl => true) vhost(lines, "manpages.debian.org" , :ssl => true, :extra => true) vhost(lines, "planet.debian.net") +vhost(lines, "cdbuilder-logs.debian.org" , :ssl => true) vhost(lines, "bits.debian.org" , :ssl => true, :extra => true) vhost(lines, "micronews.debian.org" , :ssl => true) diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index 97852c500..cb640510c 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -189,6 +189,7 @@ buildd ALL=(ALL) NOPASSWD: ALL %backports FTPHOSTS,coccia=(staticsync) NOPASSWD: /usr/local/bin/static-update-component backports.debian.org %bootstrap boott=(staticsync) NOPASSWD: /usr/local/bin/static-update-component bootstrap.debian.net d-i dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component d-i.debian.org +debian-cd casulana=(staticsync) NOPASSWD: /usr/local/bin/static-update-component cdbuilder-logs.debian.org lucas dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debaday.debian.net dsa dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component dsa.debian.org dak FTPHOSTS=(staticsync) NOPASSWD: /usr/local/bin/static-update-component incoming.debian.org -- 2.20.1