From ff818d6be896201adf0b1c9ded9316949dc954d2 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 16 Feb 2016 16:43:54 -0800
Subject: remove pinning of openvpn package to backports

---
 puppet/modules/site_apt/manifests/init.pp                | 7 ++++---
 puppet/modules/site_apt/manifests/preferences/openvpn.pp | 9 ---------
 puppet/modules/site_config/manifests/remove/files.pp     | 2 ++
 puppet/modules/site_openvpn/manifests/init.pp            | 8 +-------
 4 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 puppet/modules/site_apt/manifests/preferences/openvpn.pp

(limited to 'puppet/modules')

diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 447e1781..d6fe0e72 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -37,9 +37,10 @@ class site_apt {
 
   include ::site_apt::unattended_upgrades
 
-  apt::sources_list { 'secondary.list.disabled':
-    content => template('site_apt/secondary.list');
-  }
+  # not currently used
+  #apt::sources_list { 'secondary.list':
+  #  content => template('site_apt/secondary.list');
+  #}
 
   apt::preferences_snippet { 'facter':
     release  => "${::lsbdistcodename}-backports",
diff --git a/puppet/modules/site_apt/manifests/preferences/openvpn.pp b/puppet/modules/site_apt/manifests/preferences/openvpn.pp
deleted file mode 100644
index c7ddae25..00000000
--- a/puppet/modules/site_apt/manifests/preferences/openvpn.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class site_apt::preferences::openvpn {
-
-  apt::preferences_snippet { 'openvpn':
-    package  => 'openvpn',
-    release  => "${::lsbdistcodename}-backports",
-    priority => 999;
-  }
-
-}
diff --git a/puppet/modules/site_config/manifests/remove/files.pp b/puppet/modules/site_config/manifests/remove/files.pp
index 3efcbf0f..afdd4fce 100644
--- a/puppet/modules/site_config/manifests/remove/files.pp
+++ b/puppet/modules/site_config/manifests/remove/files.pp
@@ -16,6 +16,8 @@ class site_config::remove::files {
     '/etc/default/leap_mx':;
     '/etc/logrotate.d/mx':;
     '/etc/rsyslog.d/50-mx.conf':;
+    '/etc/apt/preferences.d/openvpn':;
+    '/etc/apt/sources.list.d/secondary.list.disabled.list':;
   }
 
   #
diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp
index 7397d89c..540262d0 100644
--- a/puppet/modules/site_openvpn/manifests/init.pp
+++ b/puppet/modules/site_openvpn/manifests/init.pp
@@ -174,14 +174,8 @@ class site_openvpn {
 
   include site_shorewall::eip
 
-  # In wheezy, we need the openvpn backport to get the 2.3 version of
-  # openvpn which has proper ipv6 support
-  include site_apt::preferences::openvpn
-
   package {
-    'openvpn':
-      ensure  => latest,
-      require => Class['site_apt::preferences::openvpn'];
+    'openvpn': ensure => latest
   }
 
   service {
-- 
cgit v1.2.3