summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apt/manifests
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-02-16 16:43:54 -0800
committerelijah <elijah@riseup.net>2016-02-16 16:43:54 -0800
commitff818d6be896201adf0b1c9ded9316949dc954d2 (patch)
treec21637e035cd693acfa35d9c0b2da3e980b1d6f7 /puppet/modules/site_apt/manifests
parent4a804551fa769ef1ffaa4b8dd658737d6155c7c1 (diff)
remove pinning of openvpn package to backports
Diffstat (limited to 'puppet/modules/site_apt/manifests')
-rw-r--r--puppet/modules/site_apt/manifests/init.pp7
-rw-r--r--puppet/modules/site_apt/manifests/preferences/openvpn.pp9
2 files changed, 4 insertions, 12 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;
- }
-
-}