diff options
author | Micah Anderson <micah@leap.se> | 2014-05-06 16:32:28 -0400 |
---|---|---|
committer | Micah Anderson <micah@leap.se> | 2014-05-06 16:32:28 -0400 |
commit | f63f302980d638633f0bdb1146f9d8a75e9eaed2 (patch) | |
tree | 7d9a4a3f4149b9e4086ee56a269ea1e8c8e7fcc8 /puppet/modules | |
parent | c334061df623e3806c544598195eb93a805a91ce (diff) |
install openvpn from wheezy-backports, this will bring in openvpn 2.3,
which will provide us with proper ipv6 support
Change-Id: I0188732aae6cbc64ab57e95bf805d6158fa17e07
Diffstat (limited to 'puppet/modules')
-rw-r--r-- | puppet/modules/site_apt/manifests/preferences/openvpn.pp | 9 | ||||
-rw-r--r-- | puppet/modules/site_openvpn/manifests/init.pp | 7 |
2 files changed, 15 insertions, 1 deletions
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; + } + +} diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp index 7aec0faa..5f49450d 100644 --- a/puppet/modules/site_openvpn/manifests/init.pp +++ b/puppet/modules/site_openvpn/manifests/init.pp @@ -168,9 +168,14 @@ 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 => installed; + ensure => installed, + require => Class['site_apt::preferences::openvpn']; } service { |