From 186b13bbe5f9cfe1a8a58ddb860e4c9c49903320 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 19 Dec 2015 12:43:00 +0100 Subject: [PATCH] Add static debconf pages --- modules/roles/misc/static-components.yaml | 12 ++++++++++++ .../static-mirroring/vhost/static-vhosts-simple.erb | 12 ++++++++++++ modules/sudo/files/sudoers | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml index a520d4eed..601e5cf18 100644 --- a/modules/roles/misc/static-components.yaml +++ b/modules/roles/misc/static-components.yaml @@ -64,6 +64,18 @@ components: metadata.ftp-master.debian.org: master: franck.debian.org source: franck.debian.org:/srv/ftp-master.debian.org/export + 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' } + debconf2.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf2.debconf.org' } + debconf3.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf3.debconf.org' } + debconf4.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf4.debconf.org' } + debconf5.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf5.debconf.org' } + 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' } + 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' } # The list of mirrors comes from puppet's hieradata. This is just to set some arguments for specific mirrors. mirrors: 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 2ee11c67c..e3a64e437 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -15,6 +15,18 @@ Use common-static-vhost-ssl appstream.debian.org Use common-static-vhost-ssl dsa.debian.org Use common-static-vhost-ssl rtc.debian.org Use common-static-vhost-with-extra security-team.debian.org "ServerAlias security-team-backend.debian.org" +Use common-static-vhost 10years.debconf.org +Use common-static-vhost debconf0.debconf.org +Use common-static-vhost debconf1.debconf.org +Use common-static-vhost debconf2.debconf.org +Use common-static-vhost debconf3.debconf.org +Use common-static-vhost debconf4.debconf.org +Use common-static-vhost debconf5.debconf.org +Use common-static-vhost debconf6.debconf.org +Use common-static-vhost debconf7.debconf.org +Use common-static-vhost es.debconf.org +Use common-static-vhost fr.debconf.org +Use common-static-vhost miniconf10.debconf.org # metadata.ftp-master.debian.org > diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index 445e40851..f930b64ab 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -197,6 +197,18 @@ debwww wolkenstein=(staticsync) NOPASSWD: /usr/local/bin/static-update-componen %publicity dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component timeline.debian.net pabs dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component timeline.debian.net %lintian lindsay=(staticsync) NOPASSWD: /usr/local/bin/static-update-component lintian.debian.org +%debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component 10years.debconf.org +%debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf0.debconf.org +%debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf1.debconf.org +%debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf2.debconf.org +%debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf3.debconf.org +%debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf4.debconf.org +%debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf5.debconf.org +%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 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 # The piuparts slave needs to handle chroots piupartss PIUPARTS_SLAVE_HOSTS=(ALL) NOPASSWD: ALL -- 2.20.1