From 625aaa11138bba365958391664299692402f8da4 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 7 Mar 2013 15:06:30 +0100 Subject: automatic update of submodule couchdb --- puppet/modules/couchdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet') diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb index dcb8a082..b915a67c 160000 --- a/puppet/modules/couchdb +++ b/puppet/modules/couchdb @@ -1 +1 @@ -Subproject commit dcb8a082ac842b0660819ea61f9448c4e373746e +Subproject commit b915a67c6e7e3b1b75400dbbd4a9ac961c8eb032 -- cgit v1.2.3 From fb6d0198fad90b0fe8e71f333a5dbd3c0d5af5db Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 9 Jul 2013 23:49:06 +0200 Subject: use file_line from stdlib instead of line, now both vpn_unlimited_tcp_resolver and vpn_unlimited_udp_resolver are included --- puppet/modules/site_openvpn/manifests/resolver.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'puppet') 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'] -- cgit v1.2.3