summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-02-12 13:12:27 -0500
committerMicah Anderson <micah@riseup.net>2013-02-12 13:13:21 -0500
commitaab5906b79a43fbcedab819a05b25bef7a2757c8 (patch)
tree17e5b73f42cd93c766144806daf44ff4afaa0f0a /puppet/modules
parent1b01713860db2cb0df080874b31c0ba898323c35 (diff)
file resources that make changes to shorewall need to make sure that shorewall is installed first (#1741)
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_shorewall/manifests/couchdb.pp3
-rw-r--r--puppet/modules/site_shorewall/manifests/ip_forward.pp2
-rw-r--r--puppet/modules/site_shorewall/manifests/sshd.pp3
-rw-r--r--puppet/modules/site_shorewall/manifests/tor.pp3
4 files changed, 7 insertions, 4 deletions
diff --git a/puppet/modules/site_shorewall/manifests/couchdb.pp b/puppet/modules/site_shorewall/manifests/couchdb.pp
index 1b7f791d..9fa59569 100644
--- a/puppet/modules/site_shorewall/manifests/couchdb.pp
+++ b/puppet/modules/site_shorewall/manifests/couchdb.pp
@@ -7,7 +7,8 @@ class site_shorewall::couchdb {
# define macro for incoming services
file { '/etc/shorewall/macro.leap_couchdb':
content => "PARAM - - tcp $couchdb_port",
- notify => Service['shorewall']
+ notify => Service['shorewall'],
+ require => Package['shorewall']
}
diff --git a/puppet/modules/site_shorewall/manifests/ip_forward.pp b/puppet/modules/site_shorewall/manifests/ip_forward.pp
index d09d4fd1..d53ee8a5 100644
--- a/puppet/modules/site_shorewall/manifests/ip_forward.pp
+++ b/puppet/modules/site_shorewall/manifests/ip_forward.pp
@@ -5,6 +5,6 @@ class site_shorewall::ip_forward {
lens => 'Shellvars.lns',
incl => '/etc/shorewall/shorewall.conf',
notify => Service[shorewall],
- require => Class[augeas];
+ require => [ Class[augeas], Package[shorewall] ];
}
}
diff --git a/puppet/modules/site_shorewall/manifests/sshd.pp b/puppet/modules/site_shorewall/manifests/sshd.pp
index 2cf4fd56..a8e09e42 100644
--- a/puppet/modules/site_shorewall/manifests/sshd.pp
+++ b/puppet/modules/site_shorewall/manifests/sshd.pp
@@ -8,7 +8,8 @@ class site_shorewall::sshd {
# define macro for incoming sshd
file { '/etc/shorewall/macro.leap_sshd':
content => "PARAM - - tcp $ssh_port",
- notify => Service['shorewall']
+ notify => Service['shorewall'],
+ require => Package['shorewall']
}
diff --git a/puppet/modules/site_shorewall/manifests/tor.pp b/puppet/modules/site_shorewall/manifests/tor.pp
index 8fe21ee6..f35af985 100644
--- a/puppet/modules/site_shorewall/manifests/tor.pp
+++ b/puppet/modules/site_shorewall/manifests/tor.pp
@@ -8,7 +8,8 @@ class site_shorewall::tor {
# define macro for incoming services
file { '/etc/shorewall/macro.leap_tor':
content => "PARAM - - tcp $tor_port ",
- notify => Service['shorewall']
+ notify => Service['shorewall'],
+ require => Package['shorewall']
}