Adding resolver class

diff --git a/manifests/init.pp b/manifests/init.pp
index a196052d300b6439f9d98cfdbe38768aeb6a0775..ba00db91859284a401ded791e39722214296ad31 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -66,6 +66,7 @@ import "subsystems/tunnel.pp"
 import "subsystems/monkeysphere.pp"
 import "subsystems/profile.pp"
 import "subsystems/schroot.pp"
+import "subsystems/resolver.pp"
 import "subsystems/utils.pp"
 import "subsystems/utils/debian.pp"
 import "subsystems/utils/desktop.pp"

diff --git a/manifests/physical.pp b/manifests/physical.pp
index 657c7d20df896bc51d88c380ca1efff1c7cdee87..97e55d39b240df647a7716013e08566aeb91b30c 100644 (file)
--- a/manifests/physical.pp
+++ b/manifests/physical.pp
@@ -8,6 +8,7 @@ class nodo::physical inherits nodo {
   include ups
   include utils::physical
   include smartmontools
+  include resolver
 
   # Vserver configuration
   $vserver_vdirbase = "/var/vservers"
@@ -24,11 +25,6 @@ class nodo::physical inherits nodo {
     default: { include ntpdate  }
   }
 
-  # DNS resolver
-  $resolvconf_domain = "$domain"
-  $resolvconf_search = "$fqdn"
-  include resolvconf
-
   # SSH Server
   #
   # We need to restrict listen address so multiple instances

diff --git a/manifests/plug.pp b/manifests/plug.pp
index e7f53de4766d1fa88f11aec9d205e1c3e76725e1..4c5d8595a371341e909762f5e10c3ec4cde2a2f7 100644 (file)
--- a/manifests/plug.pp
+++ b/manifests/plug.pp
@@ -5,6 +5,7 @@ class nodo::plug inherits nodo {
   include utils::plug
   include firewall
   include sysctl
+  include resolver
 
   backupninja::sys { "sys":
     ensure     => present,
@@ -18,11 +19,6 @@ class nodo::plug inherits nodo {
     }
   }
 
-  # DNS resolver
-  $resolvconf_domain = "$domain"
-  $resolvconf_search = "$fqdn"
-  include resolvconf
-
   # Munin configuration
   munin_node { "$hostname":
     port => '4900',

diff --git a/manifests/subsystems/resolver.pp b/manifests/subsystems/resolver.pp
new file mode 100644 (file)
index 0000000..e1e4582
--- /dev/null
+++ b/manifests/subsystems/resolver.pp
@@ -0,0 +1,11 @@
+class resolver {
+  # DNS resolver
+  case $resolvconf_nameservers {
+    '': { }
+    default: {
+      $resolvconf_domain = "$domain"
+      $resolvconf_search = "$fqdn"
+      include resolvconf
+    }
+  }
+}