From 5c973c39473c29fe3231a46b58c485c899fb3022 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 22 May 2014 12:19:04 -0400
Subject: Install wheezy-backports version of unbound, this is necessary to
 solve #2328

Change-Id: Ie28de8d3f7a8c8cf52ce30365379a476d48dc88b
---
 puppet/modules/site_config/manifests/caching_resolver.pp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'puppet/modules/site_config/manifests/caching_resolver.pp')

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,
-- 
cgit v1.2.3


From 4c4f8fd55a3d4a9e08ebaf8881b04ada931db007 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 22 May 2014 12:20:42 -0400
Subject: lint cleanup of site_config::caching_resolver

Change-Id: I3f6a4db26e064a520a08822cf23fc3288b31af62
---
 puppet/modules/site_config/manifests/caching_resolver.pp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/site_config/manifests/caching_resolver.pp')

diff --git a/puppet/modules/site_config/manifests/caching_resolver.pp b/puppet/modules/site_config/manifests/caching_resolver.pp
index 590551b0..b37cf775 100644
--- a/puppet/modules/site_config/manifests/caching_resolver.pp
+++ b/puppet/modules/site_config/manifests/caching_resolver.pp
@@ -14,14 +14,18 @@ class site_config::caching_resolver {
 
   file {
     '/etc/unbound/conf.d':
-      ensure => directory,
-      owner  => root, group => root, mode => '0755',
+      ensure  => directory,
+      owner   => root,
+      group   => root,
+      mode    => '0755',
       require => Package['unbound'];
 
     '/etc/unbound/conf.d/placeholder':
       ensure  => present,
       content => '',
-      owner   => root, group => root, mode => '0644';
+      owner   => root,
+      group   => root,
+      mode    => '0644';
   }
 
   class { 'unbound':
-- 
cgit v1.2.3


From a622e49c5df2150049afb6f6ed47177537b7e6da Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 22 May 2014 15:21:06 -0400
Subject: Implement #2328: unbound.conf: content changed on every puppetrun

This is done by using the include glob capability that is in the
wheezy-backports and newer unbound to include the
/etc/unbound/unbound.conf.d/* config files.

To do this, we need to transition from our /etc/unbound/conf.d directory
structure to use the one that the debian package uses.

This allows us to clean up the rather ugly way we were configuring the
resolver before.

Change-Id: I68347922f265bbd0ddf11d59d8574a612a7bd82c
---
 .../site_config/manifests/caching_resolver.pp        | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'puppet/modules/site_config/manifests/caching_resolver.pp')

diff --git a/puppet/modules/site_config/manifests/caching_resolver.pp b/puppet/modules/site_config/manifests/caching_resolver.pp
index b37cf775..1b8bd1a2 100644
--- a/puppet/modules/site_config/manifests/caching_resolver.pp
+++ b/puppet/modules/site_config/manifests/caching_resolver.pp
@@ -13,19 +13,13 @@ class site_config::caching_resolver {
   include site_apt::preferences::unbound
 
   file {
+    # cleanup from how we used to do it
     '/etc/unbound/conf.d':
-      ensure  => directory,
-      owner   => root,
-      group   => root,
-      mode    => '0755',
-      require => Package['unbound'];
+      force   => true,
+      ensure  => absent;
 
     '/etc/unbound/conf.d/placeholder':
-      ensure  => present,
-      content => '',
-      owner   => root,
-      group   => root,
-      mode    => '0644';
+      ensure  => absent;
   }
 
   class { 'unbound':
@@ -45,4 +39,10 @@ class site_config::caching_resolver {
       }
     }
   }
+
+  concat::fragment { 'unbound glob include':
+    target  => $unbound::params::config,
+    content => "include: /etc/unbound/unbound.conf.d/*.conf\n\n",
+    order   => 10
+  }
 }
-- 
cgit v1.2.3