From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 17 Apr 2013 21:50:40 +0000 (+0200)
Subject: use weblog_provider role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ff8cc81ab5960f98c852c95f0cc7b4f3ca377343;p=mirror%2Fdsa-puppet.git

use weblog_provider role
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index a06eb0073..91c44f044 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -285,5 +285,8 @@ host_settings:
     - franck.debian.org
     - senfl.debian.org
     - wolkenstein.debian.org
+  weblog_provider:
+    - klecker.debian.org
+    - senfter.debian.org
 #  reservedaddrs:
 #    ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index b837c61f0..cc1d52123 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -67,4 +67,8 @@ class roles {
 	} elsif getfromhash($site::nodeinfo, 'static_source') {
 		include roles::static_source
 	}
+
+	if getfromhash($site::nodeinfo, 'weblog_provider') {
+		include roles::weblog_provider
+	}
 }