diff options
author | Micah Anderson <micah@riseup.net> | 2012-06-20 11:46:58 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2012-06-20 11:46:58 -0400 |
commit | 58543cc4d02f9c47bec3c0d16561d53682881843 (patch) | |
tree | faa78a536a84c5478cec31305826c9c0d04a6c4a /manifests/rules/out/ibackup.pp | |
parent | 6cb88973f53aa7d92414797dd21952c1c1d5da98 (diff) | |
parent | be37ed29e196008209431f1401c040dd200e3019 (diff) | |
download | puppet-shorewall-58543cc4d02f9c47bec3c0d16561d53682881843.tar.gz puppet-shorewall-58543cc4d02f9c47bec3c0d16561d53682881843.tar.bz2 |
Merge remote-tracking branch 'immerda/master' into riseup
NOTE: the conflicts in the files/shorewall.conf.Debian.squeeze I resolved by
favoring the actual debian squeeze shorewall.conf, there were a few options
in the immerda one that were not the same.
Conflicts:
README
files/shorewall.conf.Debian.squeeze
manifests/base.pp
manifests/blacklist.pp
manifests/debian.pp
manifests/host.pp
manifests/init.pp
manifests/interface.pp
manifests/masq.pp
manifests/nat.pp
manifests/params.pp
manifests/policy.pp
manifests/proxyarp.pp
manifests/rfc1918.pp
manifests/routestopped.pp
manifests/rule.pp
manifests/rule_section.pp
manifests/rules/out/ekeyd.pp
manifests/zone.pp
Diffstat (limited to 'manifests/rules/out/ibackup.pp')
-rw-r--r-- | manifests/rules/out/ibackup.pp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/manifests/rules/out/ibackup.pp b/manifests/rules/out/ibackup.pp index ec12c8b..856bcdb 100644 --- a/manifests/rules/out/ibackup.pp +++ b/manifests/rules/out/ibackup.pp @@ -1,13 +1,12 @@ -class shorewall::rules::out::ibackup { - case $shorewall_ibackup_host { - '': { fail("You need to define \$shorewall_ibackup_host for ${fqdn}") } - } - shorewall::rule { 'me-net-tcp_backupssh': - source => '$FW', - destination => "net:${shorewall_ibackup_host}", - proto => 'tcp', - destinationport => 'ssh', - order => 240, - action => 'ACCEPT'; - } +class shorewall::rules::out::ibackup( + $backup_host +){ + shorewall::rule { 'me-net-tcp_backupssh': + source => '$FW', + destination => "net:${backup_host}", + proto => 'tcp', + destinationport => 'ssh', + order => 240, + action => 'ACCEPT'; + } } |