diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-09-13 14:48:37 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-09-13 14:48:37 -0300 |
| commit | be898939a839cca4a0134c34232a7216a4f2e39e (patch) | |
| tree | e14a138acb08f95cce52d9026a139607d39fe48c /manifests | |
| parent | 66ddcd5f08bf61fea97406883270728ad6a72b6b (diff) | |
| download | puppet-nodo-be898939a839cca4a0134c34232a7216a4f2e39e.tar.gz puppet-nodo-be898939a839cca4a0134c34232a7216a4f2e39e.tar.bz2 | |
Class resolver now also handles resolvconf package config
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/subsystems/resolver.pp | 11 | ||||
| -rw-r--r-- | manifests/subsystems/utils/debian.pp | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/manifests/subsystems/resolver.pp b/manifests/subsystems/resolver.pp index e1e4582..0d8beb8 100644 --- 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 41218e7..dc47f3b 100644 --- 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, } |