From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 29 Jul 2011 14:25:24 +0000 (+0200)
Subject: ftp-upcoming
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8b123a6f67037a42b1ebc71bde5f595c6b4533cb;p=mirror%2Fdsa-puppet.git

ftp-upcoming
---

diff --git a/manifests/site.pp b/manifests/site.pp
index f56d6ed3d..3a7ec4e9e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -83,6 +83,9 @@ node default {
               case getfromhash($nodeinfo, 'apache2_backports_mirror') {
                      true:    { include apache2::backports_mirror }
               }
+              case getfromhash($nodeinfo, 'apache2_ftp-upcoming_mirror') {
+                     true:    { include apache2::ftp-upcoming_mirror }
+              }
               include apache2
          }
     }
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 1e8d2b439..440037b11 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -181,8 +181,8 @@ host_settings:
     - kokkonen.debian.org
     - senfl.debian.org
     - santoro.debian.org
-    # www-master is handled differently.
-    # - wolkenstein.debian.org
+  'apache2_ftp-upcoming_mirror':
+    - rietz.debian.org
   apache2_backports_mirror:
     - englund.debian.org
     - morricone.debian.org