From f63f302980d638633f0bdb1146f9d8a75e9eaed2 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Tue, 6 May 2014 16:32:28 -0400
Subject: install openvpn from wheezy-backports, this will bring in openvpn
 2.3, which will provide us with proper ipv6 support

Change-Id: I0188732aae6cbc64ab57e95bf805d6158fa17e07
---
 puppet/modules/site_apt/manifests/preferences/openvpn.pp | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 puppet/modules/site_apt/manifests/preferences/openvpn.pp

(limited to 'puppet/modules/site_apt/manifests/preferences')

diff --git a/puppet/modules/site_apt/manifests/preferences/openvpn.pp b/puppet/modules/site_apt/manifests/preferences/openvpn.pp
new file mode 100644
index 00000000..c7ddae25
--- /dev/null
+++ b/puppet/modules/site_apt/manifests/preferences/openvpn.pp
@@ -0,0 +1,9 @@
+class site_apt::preferences::openvpn {
+
+  apt::preferences_snippet { 'openvpn':
+    package  => 'openvpn',
+    release  => "${::lsbdistcodename}-backports",
+    priority => 999;
+  }
+
+}
-- 
cgit v1.2.3


From b503e655271d755baa4ac51861c25ed5a7872b14 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 22 May 2014 12:14:28 -0400
Subject: Move rsyslog preferences snippet to site_apt::preferences::rsyslog,
 to group it with the other preferences snippets

Change-Id: I83928c6b82cd6218a80c95475729cb57f146ff85
---
 puppet/modules/site_apt/manifests/preferences/rsyslog.pp | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 puppet/modules/site_apt/manifests/preferences/rsyslog.pp

(limited to 'puppet/modules/site_apt/manifests/preferences')

diff --git a/puppet/modules/site_apt/manifests/preferences/rsyslog.pp b/puppet/modules/site_apt/manifests/preferences/rsyslog.pp
new file mode 100644
index 00000000..132a6e24
--- /dev/null
+++ b/puppet/modules/site_apt/manifests/preferences/rsyslog.pp
@@ -0,0 +1,9 @@
+class site_apt::preferences::rsyslog {
+
+  apt::preferences_snippet { 'rsyslog_anon_depends':
+    package  => 'libestr0 librelp0 rsyslog*',
+    priority => '999',
+    pin      => 'release a=wheezy-backports',
+    before   => Class['rsyslog::install']
+  }
+}
-- 
cgit v1.2.3


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_apt/manifests/preferences/unbound.pp | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 puppet/modules/site_apt/manifests/preferences/unbound.pp

(limited to 'puppet/modules/site_apt/manifests/preferences')

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'];
+  }
+
+}
-- 
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_apt/manifests/preferences/unbound.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_apt/manifests/preferences')

diff --git a/puppet/modules/site_apt/manifests/preferences/unbound.pp b/puppet/modules/site_apt/manifests/preferences/unbound.pp
index 6232fa10..6da964f9 100644
--- a/puppet/modules/site_apt/manifests/preferences/unbound.pp
+++ b/puppet/modules/site_apt/manifests/preferences/unbound.pp
@@ -1,7 +1,7 @@
 class site_apt::preferences::unbound {
 
   apt::preferences_snippet { 'unbound':
-    package  => 'libunbound unbound*',
+    package  => 'libunbound* unbound*',
     release  => "${::lsbdistcodename}-backports",
     priority => 999,
     before   => Class['unbound::package'];
-- 
cgit v1.2.3