summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2015-06-23 14:58:48 -0400
committerMicah Anderson <micah@leap.se>2015-06-23 14:58:48 -0400
commit19258e1f40a783485f6a422a630dbb33b2e2d2c8 (patch)
treef09a3f48ef2f73bdad38a05685538e0b8c33d9bd
parent554b0deed00d7d56eb775a7babf6f8b8b0608f39 (diff)
cleanup no longer used unbound conf.d pieces (#7187)
Change-Id: Ie0b1f22c49462bd5c4ee3290f100e5d3e14ccb03
-rw-r--r--puppet/modules/site_config/manifests/caching_resolver.pp10
1 files changed, 0 insertions, 10 deletions
diff --git a/puppet/modules/site_config/manifests/caching_resolver.pp b/puppet/modules/site_config/manifests/caching_resolver.pp
index abcda1d8..cdebbad0 100644
--- a/puppet/modules/site_config/manifests/caching_resolver.pp
+++ b/puppet/modules/site_config/manifests/caching_resolver.pp
@@ -1,22 +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
class { 'unbound':
root_hints => false,
anchor => false,
ssl => false,
- require => File['/etc/unbound/conf.d/placeholder'],
settings => {
server => {
verbosity => '1',