diff options
author | varac <varacanero@zeromail.org> | 2013-07-15 15:02:31 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-07-15 15:02:31 +0200 |
commit | d00d975c8680ae348e5b00f4bf90afff7ce5c089 (patch) | |
tree | eb27146bfcfd291ad703983b160e72e85fc7090d /puppet/modules/site_openvpn | |
parent | 8478e8613ded138b5d68b122cb82f5418a199764 (diff) | |
parent | fb6d0198fad90b0fe8e71f333a5dbd3c0d5af5db (diff) |
Merge branch 'hotfix/issue/3140' into develop
Diffstat (limited to 'puppet/modules/site_openvpn')
-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 dc31767c..c1bce858 100644 --- a/puppet/modules/site_openvpn/manifests/resolver.pp +++ b/puppet/modules/site_openvpn/manifests/resolver.pp @@ -54,28 +54,28 @@ class site_openvpn::resolver { # go away and instead the caching_resolver should be configured to # include: /etc/unbound/conf.d/* - line { + file_line { 'add_unlimited_tcp_resolver': ensure => $ensure_unlimited, - file => '/etc/unbound/unbound.conf', + path => '/etc/unbound/unbound.conf', line => 'server: include: /etc/unbound/conf.d/vpn_unlimited_tcp_resolver', notify => Service['unbound'], require => Package['unbound']; 'add_unlimited_udp_resolver': ensure => $ensure_unlimited, - file => '/etc/unbound/unbound.conf', + path => '/etc/unbound/unbound.conf', line => 'server: include: /etc/unbound/conf.d/vpn_unlimited_udp_resolver', notify => Service['unbound'], require => Package['unbound']; 'add_limited_tcp_resolver': ensure => $ensure_limited, - file => '/etc/unbound/unbound.conf', + 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': ensure => $ensure_limited, - file => '/etc/unbound/unbound.conf', + path => '/etc/unbound/unbound.conf', line => 'server: include: /etc/unbound/conf.d/vpn_limited_udp_resolver', notify => Service['unbound'], require => Package['unbound'] |