From 792bb2e7a864c4f3d8a1b9f1dd241acf81349ba8 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 1 Oct 2017 21:34:54 +0200 Subject: [PATCH] Add debconf17.dc.o static component --- modules/roles/manifests/static_mirror.pp | 2 ++ modules/roles/misc/static-components.yaml | 1 + .../templates/static-mirroring/vhost/static-vhosts-simple.erb | 1 + modules/sudo/files/sudoers | 1 + 4 files changed, 5 insertions(+) diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index cade338ca..1a754f9ac 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -122,6 +122,7 @@ class roles::static_mirror { ssl::service { 'debconf0.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf1.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 { 'debconf17.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf18.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf2.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf3.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } @@ -173,6 +174,7 @@ class roles::static_mirror { onion::service { 'debconf0.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debconf1.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 { 'debconf17.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debconf18.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debconf2.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debconf3.debconf.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 cac28b279..0f524c731 100644 --- a/modules/roles/misc/static-components.yaml +++ b/modules/roles/misc/static-components.yaml @@ -112,6 +112,7 @@ components: debconf6.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf6.debconf.org' } debconf7.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf7.debconf.org' } debconf16.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf16.debconf.org' } + debconf17.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf17.debconf.org' } debconf18.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf18.debconf.org' } es.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/es.debconf.org' } fr.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/fr.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 688b6edbd..493c8c489 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -227,6 +227,7 @@ 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, "debconf17.debconf.org" , :ssl => true) vhost(lines, "debconf18.debconf.org" , :ssl => true) vhost(lines, "es.debconf.org" , :ssl => true) vhost(lines, "fr.debconf.org" , :ssl => true) diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index b1db2b964..9f3f9cbee 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -211,6 +211,7 @@ pabs dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component time %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf6.debconf.org %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf7.debconf.org %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf16.debconf.org +%debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf17.debconf.org %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf18.debconf.org %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component es.debconf.org %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component fr.debconf.org -- 2.20.1