aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystems
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-03-30 19:37:28 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-03-30 19:37:28 -0300
commitb6775a929aa275358e91cb311bf570735ebc410d (patch)
tree850f440b569137f87158dc730ddad78bbd524122 /manifests/subsystems
parentcc8c2f7ee148a643bd0b23487e4e9e9f773f4da3 (diff)
downloadpuppet-nodo-b6775a929aa275358e91cb311bf570735ebc410d.tar.gz
puppet-nodo-b6775a929aa275358e91cb311bf570735ebc410d.tar.bz2
Resolver class now can configure resolv.conf's domain and search parameters
Diffstat (limited to 'manifests/subsystems')
-rw-r--r--manifests/subsystems/resolver.pp7
1 files changed, 5 insertions, 2 deletions
diff --git a/manifests/subsystems/resolver.pp b/manifests/subsystems/resolver.pp
index ac80cf6..a6604f5 100644
--- a/manifests/subsystems/resolver.pp
+++ b/manifests/subsystems/resolver.pp
@@ -1,6 +1,8 @@
class resolver(
- $manage = hiera('nodo::resolver::manage', false),
+ $manage = hiera('nodo::resolver::manage', false),
$nameservers = hiera('nodo::resolver::nameservers', '')
+ $domain = hiera('nodo::resolver::domain', $::domain),
+ $search = hiera('nodo::resolver::search', $::fqdn)
) {
# DNS resolver
case $manage {
@@ -16,7 +18,8 @@ class resolver(
}
default: {
class { 'resolvconf':
- search => $::fqdn,
+ domain => $domain,
+ search => $search,
nameservers => $nameservers,
}
}