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 46cf22105ff42608651f87c6e23ffb8a66e4f2ca..2ebb107abaa21cf7adb4d2416df7bd6789a6fef0 100644 (file)
--- 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      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
 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 97ed145a3b00a66fb9742435748c6bb77e91cbf7..847b7a8b9f08b029c6e43354456b067bcae67d30 100644 (file)
--- 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 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"
 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 d8b63d3729205757fcaeb6b07fec92399ab4f0bc..5a6920c6d932c18c1b36c0d3cecc9486577a0b2f 100644 (file)
--- 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
 %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
 %lintian       lindsay=(staticsync)            NOPASSWD: /usr/local/bin/static-update-component lintian.debian.org
 
 # The piuparts slave needs to handle chroots