rename ftp-master.metadata to metadata.ftp-master

diff --git a/modules/roles/files/static-mirroring/static-components.conf b/modules/roles/files/static-mirroring/static-components.conf
index 81823c78a6084189f40fb488d2b75257ef1baaa6..f1ecdbbc8f58a9b807bb990460bd8481665a1b86 100644 (file)
--- 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 672726a00a8cb8433063fedc891ecf6eb9f44b68..adaed409b15e60557b3a803057ce63b8ec9ad8f1 100644 (file)
--- 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/
 </VirtualHost>
 
+<VirtualHost <%= vhost_listen %> >
+       ServerName ftp-master.metadata.debian.org
+       ServerAdmin debian-admin@debian.org
+       RedirectPermanent / http://metadata.ftp-master.debian.org/
+</VirtualHost>
+
 # vim:ft=apache:

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index a99ae6c1a834f0df9ceb2afacca2d868b3fd940a..e04675e0a6f0aa6e6679269028c149f0fe805d90 100644 (file)
--- 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