From: Luca Filipozzi Date: Fri, 3 Aug 2018 09:36:00 +0000 (+0000) Subject: action RT#7389 - debconf19.debconf.org setup X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=94a2405221354b24e14db3228db348c702031d7a;p=mirror%2Fdsa-puppet.git action RT#7389 - debconf19.debconf.org setup Signed-off-by: Luca Filipozzi --- diff --git a/modules/roles/manifests/debconf_wafer.pp b/modules/roles/manifests/debconf_wafer.pp index 433c51bf4..d03bafc12 100644 --- a/modules/roles/manifests/debconf_wafer.pp +++ b/modules/roles/manifests/debconf_wafer.pp @@ -22,5 +22,14 @@ class roles::debconf_wafer { site => 'debconf18.debconf.org', source => 'puppet:///modules/roles/debconf_wafer/debconf18.debconf.org', } + + ssl::service { 'debconf19.debconf.org': + notify => Exec['service apache2 reload'], + key => true, + } + apache2::site { '010-debconf19.debconf.org': + site => 'debconf19.debconf.org', + source => 'puppet:///modules/roles/debconf_wafer/debconf19.debconf.org', + } } diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml index c41bd3157..094eec886 100644 --- a/modules/roles/misc/static-components.yaml +++ b/modules/roles/misc/static-components.yaml @@ -115,6 +115,7 @@ components: 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' } + debconf19.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf19.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' } miniconf10.debconf.org: { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/miniconf10.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 ca437c7bc..943872840 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, "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, "debconf19.debconf.org" , :ssl => true) vhost(lines, "es.debconf.org" , :ssl => true) vhost(lines, "fr.debconf.org" , :ssl => true) vhost(lines, "miniconf10.debconf.org" , :ssl => true) diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index f7b875333..8c2265194 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -238,6 +238,7 @@ pabs dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component time %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 debconf19.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 %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component miniconf10.debconf.org