diff options
| author | Micah Anderson <micah@leap.se> | 2013-10-02 10:37:05 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-10-02 10:37:05 -0400 |
| commit | 3b532da3871a5a655af4b0741348d9140b0ebf6a (patch) | |
| tree | a8dd1956784e0c0d31f93af1877701b7e0943ba8 | |
| parent | 81fe380535c731c7afc134fb4e62b6232f690375 (diff) | |
only add vpn_(un)?limited_udp_resolver and vpn_(un)?limited_tcp_resolver lines to unbound.conf if the openvpn package is installed (#3868)
Change-Id: I65852660a606ccea7569b2207bd535bd8aa3867c
| -rw-r--r-- | puppet/modules/site_openvpn/manifests/resolver.pp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/puppet/modules/site_openvpn/manifests/resolver.pp b/puppet/modules/site_openvpn/manifests/resolver.pp index c1bce858..c74fb509 100644 --- a/puppet/modules/site_openvpn/manifests/resolver.pp +++ b/puppet/modules/site_openvpn/manifests/resolver.pp @@ -60,25 +60,25 @@ class site_openvpn::resolver { path => '/etc/unbound/unbound.conf', line => 'server: include: /etc/unbound/conf.d/vpn_unlimited_tcp_resolver', notify => Service['unbound'], - require => Package['unbound']; + require => [ Package['openvpn'], Package['unbound'] ]; 'add_unlimited_udp_resolver': ensure => $ensure_unlimited, path => '/etc/unbound/unbound.conf', line => 'server: include: /etc/unbound/conf.d/vpn_unlimited_udp_resolver', notify => Service['unbound'], - require => Package['unbound']; + require => [ Package['openvpn'], Package['unbound'] ]; 'add_limited_tcp_resolver': ensure => $ensure_limited, path => '/etc/unbound/unbound.conf', line => 'server: include: /etc/unbound/conf.d/vpn_limited_tcp_resolver', notify => Service['unbound'], - require => Package['unbound']; - 'add_limited_udp_resolver': + require => [ Package['openvpn'], Package['unbound'] ]; + 'add_limited_udp_resolver': ensure => $ensure_limited, path => '/etc/unbound/unbound.conf', line => 'server: include: /etc/unbound/conf.d/vpn_limited_udp_resolver', notify => Service['unbound'], - require => Package['unbound'] + require => [ Package['openvpn'], Package['unbound'] ]; } } |