]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Prepare staticsync for backports
authorPeter Palfrader <peter@palfrader.org>
Sat, 6 Apr 2013 12:46:13 +0000 (14:46 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sat, 6 Apr 2013 12:46:20 +0000 (14:46 +0200)
modules/debian-org/misc/local.yaml
modules/roles/files/static-mirroring/static-components.conf
modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
modules/sudo/files/sudoers

index e55f40361483a6207b5f5dc3125a4103bad9d496..e982a04c5fc8d7b0f509086d1fbb25d662ab8b0f 100644 (file)
@@ -284,6 +284,7 @@ host_settings:
     - stanley.debian.org
   static_source:
     - master.debian.org
+    - ries.debian.org
     - senfl.debian.org
     - wolkenstein.debian.org
 #  reservedaddrs:
index 107c62427a3d2a3a88050abbb7e868016d184401..6ce4e3aa875383f5da29ca51577f10264420d0cf 100644 (file)
@@ -4,3 +4,4 @@ mozilla.debian.net      wagner.debian.org       /srv/home/groups/pkg-mozilla/htdocs
 planet.debian.org      senfl.debian.org        /srv/planet.debian.org/www
 www.debian.org         wolkenstein.debian.org  /srv/www.debian.org/www
 bits.debian.org                master.debian.org       /srv/bits-master.debian.org/htdocs
+backports.debian.org   ries.debian.org         /srv/backports.debian.org/htdocs
index d8e4286cd514c9fbec5454361adea41723e9d771..9bb3ea8c50f8e7bacd17b970996d9fa6c67a8e13 100644 (file)
@@ -2,5 +2,11 @@
 
 Use common-static-vhost mozilla.debian.net
 Use common-static-vhost bits.debian.org
+Use common-static-vhost backports.debian.org
 
+<Virtualhost <%= vhost_listen %> >
+       ServerName backports-master.debian.org
+       ServerAdmin debian-admin@debian.org
+       Redirect permanent / http://backports.debian.org/
+</VirtualHost>
 # vim:ft=apache:
index 93dec6729009ba08d2eac338375c2d3992ba4afe..e2ee5cec2fcb0d50826a6f6dfc72d993ca1cd7a3 100644 (file)
@@ -129,6 +129,7 @@ buildd              ALL=(ALL)               NOPASSWD: ALL
 
 %planet                senfl=(staticsync)      NOPASSWD: /usr/local/bin/static-update-component planet.debian.org
 %debbits       master=(staticsync)     NOPASSWD: /usr/local/bin/static-update-component bits.debian.org
+%backports     ries=(staticsync)       NOPASSWD: /usr/local/bin/static-update-component backports.debian.org
 
 # The piuparts slave needs to handle chroots
 piupartss      piatti=(ALL)            NOPASSWD: ALL