Class resolver now also handles resolvconf package config

diff --git a/manifests/subsystems/resolver.pp b/manifests/subsystems/resolver.pp
index e1e45823ad5142723e28997644f13a81e5e2652a..0d8beb8f57e398ebd65ba893877334f04ed65ef6 100644 (file)
--- a/manifests/subsystems/resolver.pp
+++ b/manifests/subsystems/resolver.pp
@@ -1,7 +1,16 @@
 class resolver {
   # DNS resolver
   case $resolvconf_nameservers {
-    '': { }
+    '': {
+      package { 'resolvconf':
+        ensure => present,
+      }
+
+      file { '/etc/resolv.conf':
+        ensure => '/etc/resolvconf/run/resolv.conf',
+        require => Package['resolvconf'],
+      }
+    }
     default: {
       $resolvconf_domain = "$domain"
       $resolvconf_search = "$fqdn"

diff --git a/manifests/subsystems/utils/debian.pp b/manifests/subsystems/utils/debian.pp
index 41218e703a7437fdf4c611f8d41ba0e1aac13da3..dc47f3b7c8bf702c0d3614e641ce618bd157e656 100644 (file)
--- a/manifests/subsystems/utils/debian.pp
+++ b/manifests/subsystems/utils/debian.pp
@@ -40,7 +40,7 @@ class utils::personal::debian {
               'msmtp',             'mairix',     'konqueror',        'bittorrent',
               'irssi-scripts',     'links',      'twinkle',          'bittornado',
               'rtorrent',          'iceweasel',  'irssi-plugin-otr', 'transmission',
-              'openvpn',           'resolvconf' ]:
+              'openvpn' ]:
     ensure => installed,
   }