From 02877fd7a80d851f757aa7d6ea19fa5f84c5d40e Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 14 Jan 2014 07:54:15 +0100 Subject: [PATCH] rename ftp-master.metadata to metadata.ftp-master --- .../roles/files/static-mirroring/static-components.conf | 2 +- .../static-mirroring/vhost/static-vhosts-simple.erb | 8 +++++++- modules/sudo/files/sudoers | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/roles/files/static-mirroring/static-components.conf b/modules/roles/files/static-mirroring/static-components.conf index 81823c78..f1ecdbbc 100644 --- a/modules/roles/files/static-mirroring/static-components.conf +++ b/modules/roles/files/static-mirroring/static-components.conf @@ -7,7 +7,7 @@ bizet.debian.org bits.debian.org master.debian.org /srv/bits-master.debian.org bizet.debian.org network-test.debian.org master.debian.org /srv/network-test.debian.org/htdocs bizet.debian.org news.debian.net ravel.debian.org /srv/news.debian.net/htdocs franck.debian.org backports.debian.org franck.debian.org /srv/backports.debian.org/htdocs -franck.debian.org ftp-master.metadata.debian.org franck.debian.org /srv/ftp-master.debian.org/export +franck.debian.org metadata.ftp-master.debian.org franck.debian.org /srv/ftp-master.debian.org/export dillon.debian.org blends.debian.org dillon.debian.org /srv/blends.debian.org/www dillon.debian.org d-i.debian.org dillon.debian.org /srv/d-i.debian.org/www dillon.debian.org dsa.debian.org dillon.debian.org /srv/dsa.debian.org/htdocs 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 672726a0..adaed409 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -4,7 +4,7 @@ Use common-static-vhost mozilla.debian.net Use common-static-vhost backports.debian.org Use common-static-vhost-publiclog bits.debian.org Use common-static-vhost news.debian.net -Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCharset utf-8" +Use common-static-vhost-with-extra metadata.ftp-master.debian.org "AddDefaultCharset utf-8" 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" @@ -95,4 +95,10 @@ Use common-static-vhost-ssl dsa.debian.org RedirectPermanent / http://www.debian.org/volatile/ + > + ServerName ftp-master.metadata.debian.org + ServerAdmin debian-admin@debian.org + RedirectPermanent / http://metadata.ftp-master.debian.org/ + + # vim:ft=apache: diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index a99ae6c1..e04675e0 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -142,7 +142,7 @@ buildd ALL=(ALL) NOPASSWD: ALL %backports franck,coccia=(staticsync) NOPASSWD: /usr/local/bin/static-update-component backports.debian.org d-i dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component d-i.debian.org dsa dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component dsa.debian.org -dak franck=(staticsync) NOPASSWD: /usr/local/bin/static-update-component ftp-master.metadata.debian.org +dak franck=(staticsync) NOPASSWD: /usr/local/bin/static-update-component metadata.ftp-master.debian.org %debbits master=(staticsync) NOPASSWD: /usr/local/bin/static-update-component bits.debian.org %webwml master=(staticsync) NOPASSWD: /usr/local/bin/static-update-component network-test.debian.org planet philp,senfl=(staticsync) NOPASSWD: /usr/local/bin/static-update-component planet.debian.org -- 2.39.2