From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 1 Mar 2011 22:00:27 +0000 (+0100)
Subject: move dns stuff closer together
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3b2bc9d44835cbec74475b2aacf823e328b874d2;p=dsa-puppet.git

move dns stuff closer together
---

diff --git a/manifests/site.pp b/manifests/site.pp
index b8134990..482cc6ba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -105,6 +105,10 @@ node default {
     case $hostname {
         ries:   { include unbound }
     }
+    case getfromhash($hosterinfo, 'nameservers') {
+        false:      {}
+        default:    { include resolv }
+    }
 
     case $kernel {
         Linux: {
@@ -125,10 +129,6 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
-    case getfromhash($hosterinfo, 'nameservers') {
-        false:      {}
-        default:    { include resolv }
-    }
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }