summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2016-06-23 14:05:20 -0400
committerMicah <micah@leap.se>2016-08-25 15:07:09 -0400
commit6e6b56f40c74521b510efc5e9189c2a9e5bc5eb1 (patch)
treed6a5237331821b2e01c13488877cb81e2220ce20 /puppet/modules
parent16f17642210c2ca9b9a334fab8dcdf61d5202bc9 (diff)
Make sure bind9 doesn't take over unbound (#8213).
Change-Id: Icaab817870d005b7a854a3fb8c402705d0b2d77f
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_config/manifests/caching_resolver.pp12
1 files changed, 12 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/caching_resolver.pp b/puppet/modules/site_config/manifests/caching_resolver.pp
index 8bf465c1..59b135a3 100644
--- a/puppet/modules/site_config/manifests/caching_resolver.pp
+++ b/puppet/modules/site_config/manifests/caching_resolver.pp
@@ -2,10 +2,22 @@
class site_config::caching_resolver {
tag 'leap_base'
+ # We need to make sure Package['bind9'] isn't installed because when it is, it
+ # keeps unbound from running. Some base debian installs will install bind9,
+ # and then start it, so unbound will never get properly started. So this will
+ # make sure bind9 is removed before.
+ package { 'bind9':
+ ensure => absent
+ }
+ file { [ '/etc/default/bind9', '/etc/bind/named.conf.options' ]:
+ ensure => absent
+ }
+
class { 'unbound':
root_hints => false,
anchor => false,
ssl => false,
+ require => Package['bind9'],
settings => {
server => {
verbosity => '1',