summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puppet/modules/site_apt/manifests/init.pp7
-rw-r--r--puppet/modules/site_apt/manifests/preferences/openvpn.pp9
-rw-r--r--puppet/modules/site_config/manifests/remove/files.pp2
-rw-r--r--puppet/modules/site_openvpn/manifests/init.pp8
4 files changed, 7 insertions, 19 deletions
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 {