aboutsummaryrefslogtreecommitdiff
path: root/manifests/rules
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2012-06-06 01:19:34 -0300
committermh <mh@immerda.ch>2012-06-06 01:19:34 -0300
commit5f5482a2084029382a10058a287ff85c8c16c7ac (patch)
tree2e4c6f2fe63e525935133685b6341928ac3f7885 /manifests/rules
parentce27d7cd097c0e2267be494b9988efe91b87165f (diff)
downloadpuppet-shorewall-5f5482a2084029382a10058a287ff85c8c16c7ac.tar.gz
puppet-shorewall-5f5482a2084029382a10058a287ff85c8c16c7ac.tar.bz2
fix for new style for 2.7
Diffstat (limited to 'manifests/rules')
-rw-r--r--manifests/rules/jetty/http.pp2
-rw-r--r--manifests/rules/out/ibackup.pp9
-rw-r--r--manifests/rules/puppet.pp21
3 files changed, 13 insertions, 19 deletions
diff --git a/manifests/rules/jetty/http.pp b/manifests/rules/jetty/http.pp
index be19622..4c0652b 100644
--- a/manifests/rules/jetty/http.pp
+++ b/manifests/rules/jetty/http.pp
@@ -2,7 +2,7 @@ class shorewall::rules::jetty::http {
# dnat
shorewall::rule {
'dnat-http-to-jetty':
- destination => "net:${ipaddress}:8080",
+ destination => "net:${::ipaddress}:8080",
destinationport => '80',
source => 'net', proto => 'tcp', order => 140, action => 'DNAT';
}
diff --git a/manifests/rules/out/ibackup.pp b/manifests/rules/out/ibackup.pp
index ec12c8b..48714af 100644
--- a/manifests/rules/out/ibackup.pp
+++ b/manifests/rules/out/ibackup.pp
@@ -1,10 +1,9 @@
-class shorewall::rules::out::ibackup {
- case $shorewall_ibackup_host {
- '': { fail("You need to define \$shorewall_ibackup_host for ${fqdn}") }
- }
+class shorewall::rules::out::ibackup(
+ $backup_host = hiera('shorewall_ibackup_host')
+) {
shorewall::rule { 'me-net-tcp_backupssh':
source => '$FW',
- destination => "net:${shorewall_ibackup_host}",
+ destination => "net:${backup_host}",
proto => 'tcp',
destinationport => 'ssh',
order => 240,
diff --git a/manifests/rules/puppet.pp b/manifests/rules/puppet.pp
index b53c726..c6fc09b 100644
--- a/manifests/rules/puppet.pp
+++ b/manifests/rules/puppet.pp
@@ -1,16 +1,11 @@
-class shorewall::rules::puppet {
- case $shorewall_puppetserver {
- '': { $shorewall_puppetserver = "puppet.${domain}" }
- }
- case $shorewall_puppetserver_port {
- '': { $shorewall_puppetserver_port = '8140' }
- }
- case $shorewall_puppetserver_signport {
- '': { $shorewall_puppetserver_signport = '8141' }
- }
+class shorewall::rules::puppet(
+ $puppetserver = hiera('shorewall_puppetserver',"puppet.${domain}"),
+ $puppetserver_port = hiera('shorewall_puppetserver_port',8140) ,
+ $puppetserver_signport = hiera('shorewall_puppetserver_signport',8141) ,
+) {
shorewall::params{
- 'PUPPETSERVER': value => $shorewall_puppetserver;
- 'PUPPETSERVER_PORT': value => $shorewall_puppetserver_port;
- 'PUPPETSERVER_SIGN_PORT': value => $shorewall_puppetserver_signport;
+ 'PUPPETSERVER': value => $puppetserver;
+ 'PUPPETSERVER_PORT': value => $puppetserver_port;
+ 'PUPPETSERVER_SIGN_PORT': value => $puppetserver_signport;
}
}