diff options
author | Micah Anderson <micah@leap.se> | 2015-07-23 11:46:55 -0400 |
---|---|---|
committer | Micah Anderson <micah@leap.se> | 2015-07-23 11:46:55 -0400 |
commit | 70b1c648b94e6c007b9241a4661f33881e74485f (patch) | |
tree | 999e5dc1f386fc3894889c1cf263094cc748fd41 /puppet/modules/site_config/manifests/caching_resolver.pp | |
parent | b429b30bda4dafc78cb02f6ece5d82f08e35de1f (diff) | |
parent | 2761fa77394d5a2857812de840e49172d0e486fb (diff) |
Merge branch 'develop'
Diffstat (limited to 'puppet/modules/site_config/manifests/caching_resolver.pp')
-rw-r--r-- | puppet/modules/site_config/manifests/caching_resolver.pp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/puppet/modules/site_config/manifests/caching_resolver.pp b/puppet/modules/site_config/manifests/caching_resolver.pp index 1b8bd1a2..cdebbad0 100644 --- a/puppet/modules/site_config/manifests/caching_resolver.pp +++ b/puppet/modules/site_config/manifests/caching_resolver.pp @@ -1,32 +1,12 @@ class site_config::caching_resolver { tag 'leap_base' - # Setup a conf.d directory to place additional unbound configuration files. - # There must be at least one file in the directory, or unbound will not start, - # so create an empty placeholder to ensure this. - - # Note: the version of unbound we are working with does not accept a wildcard - # for an include directive, so we are not able to use this. When we can use - # the newer unbound, then we will add 'include: /etc/unbound.d/*' to the - # configuration file - include site_apt::preferences::unbound - file { - # cleanup from how we used to do it - '/etc/unbound/conf.d': - force => true, - ensure => absent; - - '/etc/unbound/conf.d/placeholder': - ensure => absent; - } - class { 'unbound': root_hints => false, anchor => false, ssl => false, - require => File['/etc/unbound/conf.d/placeholder'], settings => { server => { verbosity => '1', |