new resolvconf module uses parameterized class

1 files changed, 8 insertions, 5 deletions

diff --git a/puppet/modules/site_config/manifests/resolvconf.pp b/puppet/modules/site_config/manifests/resolvconf.pp
index ec3ce9e9..6536969a 100644
--- a/puppet/modules/site_config/manifests/resolvconf.pp
+++ b/puppet/modules/site_config/manifests/resolvconf.pp
@@ -4,10 +4,13 @@ class site_config::resolvconf {
   }
 
   $domain_hash = hiera('domain')
-  $domain = $domain_hash['public']
+  $domain_public = $domain_hash['public']
 
-  $resolvconf_search = $domain
-  $resolvconf_domain = $domain
-  $resolvconf_nameservers = '127.0.0.1 # caching-only local bind:87.118.100.175  # http://server.privacyfoundation.de'
-  include resolvconf
+  # 127.0.0.1: caching-only local bind
+  # 87.118.100.175: http://server.privacyfoundation.de
+  class { 'resolvconf':
+    $domain = $domain_public,
+    $search = $domain_public,
+    $nameservers = [ '127.0.0.1', '87.118.100.175' ]
+  }
 }