summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2016-06-23 14:05:20 -0400
committerMicah <micah@leap.se>2016-08-25 15:13:53 -0400
commit86522e3205ff1596dbd687033080557034781d80 (patch)
treeada2bd12fd64accaa20e6ee0875575ad620c5a82
parentd3807847b78c9441f2089cb383f2e74a612108e4 (diff)
Make sure bind9 doesn't take over unbound (#8213).
Change-Id: Icaab817870d005b7a854a3fb8c402705d0b2d77f
-rw-r--r--puppet/modules/site_config/manifests/caching_resolver.pp5
1 files changed, 1 insertions, 4 deletions
diff --git a/puppet/modules/site_config/manifests/caching_resolver.pp b/puppet/modules/site_config/manifests/caching_resolver.pp
index 59b135a3..5541472d 100644
--- a/puppet/modules/site_config/manifests/caching_resolver.pp
+++ b/puppet/modules/site_config/manifests/caching_resolver.pp
@@ -7,10 +7,7 @@ class site_config::caching_resolver {
# 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
+ ensure => purged
}
class { 'unbound':