summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-02-26 15:14:24 -0500
committerMicah Anderson <micah@riseup.net>2013-02-26 15:14:24 -0500
commitcd96f130a304accaf0bbef5f751dc75976f3116e (patch)
tree63b8f80b940bb72f3bd8d3313c164293bbee4d9d
parentb3aca2b0cd35f9cc921d1703a597ddbc91529044 (diff)
require that the package unbound be installed before trying to write to its
configuration file, this addresses issue #1853 - [vpn1] err: /Stage[main]/Site_openvpn::Resolver/Line[add_tcp_resolver]/Exec[echo 'server: include: /etc/unbound/conf.d/vpn_tcp_resolver' >> '/etc/unbound/unbound.conf']/returns: change from notrun to 0 failed: echo 'server: include: /etc/unbound/conf.d/vpn_tcp_resolver' >> '/etc/unbound/unbound.conf' returned 2 instead of one of [0] at /srv/leap/puppet/modules/common/manifests/defines/line.pp:45
-rw-r--r--puppet/modules/site_openvpn/manifests/resolver.pp18
1 files changed, 10 insertions, 8 deletions
diff --git a/puppet/modules/site_openvpn/manifests/resolver.pp b/puppet/modules/site_openvpn/manifests/resolver.pp
index 939207bd..26785edb 100644
--- a/puppet/modules/site_openvpn/manifests/resolver.pp
+++ b/puppet/modules/site_openvpn/manifests/resolver.pp
@@ -8,16 +8,18 @@ class site_openvpn::resolver {
line {
'add_tcp_resolver':
- ensure => present,
- file => '/etc/unbound/unbound.conf',
- line => 'server: include: /etc/unbound/conf.d/vpn_tcp_resolver',
- notify => Service['unbound'];
+ ensure => present,
+ file => '/etc/unbound/unbound.conf',
+ line => 'server: include: /etc/unbound/conf.d/vpn_tcp_resolver',
+ notify => Service['unbound'],
+ require => Package['unbound'];
'add_udp_resolver':
- ensure => present,
- file => '/etc/unbound/unbound.conf',
- line => 'server: include: /etc/unbound/conf.d/vpn_udp_resolver',
- notify => Service['unbound'];
+ ensure => present,
+ file => '/etc/unbound/unbound.conf',
+ line => 'server: include: /etc/unbound/conf.d/vpn_udp_resolver',
+ notify => Service['unbound'],
+ require => Package['unbound']
}
file {