From: Paul Wise Date: Sat, 15 Aug 2015 12:19:46 +0000 (+0200) Subject: Add timeline.debian.net to the static CDN X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=cbe56bbf7e918af1ac70190ad463a2073eb4ae88;p=mirror%2Fdsa-puppet.git Add timeline.debian.net to the static CDN --- diff --git a/modules/roles/files/static-mirroring/static-components.conf b/modules/roles/files/static-mirroring/static-components.conf index 46cf22105..2ebb107ab 100644 --- a/modules/roles/files/static-mirroring/static-components.conf +++ b/modules/roles/files/static-mirroring/static-components.conf @@ -18,6 +18,7 @@ dillon.debian.org rtc.debian.org dillon.debian.org /srv/rtc.debian.org/htdocs dillon.debian.org security-team.debian.org dillon.debian.org /srv/security-team.debian.org/htdocs dillon.debian.org wnpp-by-tags.debian.net dillon.debian.org /srv/wnpp-by-tags.debian.net/www dillon.debian.org www.ports.debian.org dillon.debian.org /srv/ports.debian.org/htdocs +dillon.debian.org timeline.debian.net dillon.debian.org /srv/timeline.debian.net/htdocs franck.debian.org backports.debian.org franck.debian.org /srv/backports.debian.org/htdocs franck.debian.org incoming.debian.org franck.debian.org /srv/ftp-master.debian.org/public/incoming.debian.org/web franck.debian.org metadata.ftp-master.debian.org franck.debian.org /srv/ftp-master.debian.org/export 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 97ed145a3..847b7a8b9 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -6,6 +6,7 @@ Use common-static-vhost incoming.debian.org Use common-static-vhost news.debian.net Use common-static-vhost debaday.debian.net Use common-static-vhost debdeltas.debian.net +Use common-static-vhost timeline.debian.net Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debian.org" Use common-static-vhost-with-extra network-test.debian.org "ServerAlias network-test-backend.debian.org" Use common-static-vhost-with-extra blends.debian.org "ServerAlias blends-backend.debian.org" diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index d8b63d372..5a6920c6d 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -178,6 +178,7 @@ debwww wolkenstein=(staticsync) NOPASSWD: /usr/local/bin/static-update-componen %ports dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component www.ports.debian.org %debvoip dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component rtc.debian.org %security dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component security-team.debian.org +%publicity 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 # The piuparts slave needs to handle chroots