From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 6 Apr 2013 12:46:13 +0000 (+0200)
Subject: Prepare staticsync for backports
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=aed4553a3e2cdb43f83711429bd95cd8231de244

Prepare staticsync for backports
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index e55f4036..e982a04c 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -284,6 +284,7 @@ host_settings:
     - stanley.debian.org
   static_source:
     - master.debian.org
+    - ries.debian.org
     - senfl.debian.org
     - wolkenstein.debian.org
 #  reservedaddrs:
diff --git a/modules/roles/files/static-mirroring/static-components.conf b/modules/roles/files/static-mirroring/static-components.conf
index 107c6242..6ce4e3aa 100644
--- a/modules/roles/files/static-mirroring/static-components.conf
+++ b/modules/roles/files/static-mirroring/static-components.conf
@@ -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
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 d8e4286c..9bb3ea8c 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -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:
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 93dec672..e2ee5cec 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -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