summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-05-22 12:19:04 -0400
committerMicah Anderson <micah@leap.se>2014-05-22 12:19:04 -0400
commit5c973c39473c29fe3231a46b58c485c899fb3022 (patch)
tree00b55e057c855b4f79f04abcdbd9c3bf77c7f77a /puppet/modules
parentb503e655271d755baa4ac51861c25ed5a7872b14 (diff)
Install wheezy-backports version of unbound, this is necessary to solve #2328
Change-Id: Ie28de8d3f7a8c8cf52ce30365379a476d48dc88b
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_apt/manifests/preferences/unbound.pp10
-rw-r--r--puppet/modules/site_config/manifests/caching_resolver.pp2
2 files changed, 12 insertions, 0 deletions
diff --git a/puppet/modules/site_apt/manifests/preferences/unbound.pp b/puppet/modules/site_apt/manifests/preferences/unbound.pp
new file mode 100644
index 00000000..6232fa10
--- /dev/null
+++ b/puppet/modules/site_apt/manifests/preferences/unbound.pp
@@ -0,0 +1,10 @@
+class site_apt::preferences::unbound {
+
+ apt::preferences_snippet { 'unbound':
+ package => 'libunbound unbound*',
+ release => "${::lsbdistcodename}-backports",
+ priority => 999,
+ before => Class['unbound::package'];
+ }
+
+}
diff --git a/puppet/modules/site_config/manifests/caching_resolver.pp b/puppet/modules/site_config/manifests/caching_resolver.pp
index 3d7b9206..590551b0 100644
--- a/puppet/modules/site_config/manifests/caching_resolver.pp
+++ b/puppet/modules/site_config/manifests/caching_resolver.pp
@@ -10,6 +10,8 @@ class site_config::caching_resolver {
# the newer unbound, then we will add 'include: /etc/unbound.d/*' to the
# configuration file
+ include site_apt::preferences::unbound
+
file {
'/etc/unbound/conf.d':
ensure => directory,