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/providers.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/providers.pp')
-rw-r--r-- | manifests/providers.pp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/manifests/providers.pp b/manifests/providers.pp new file mode 100644 index 0000000..a02a494 --- /dev/null +++ b/manifests/providers.pp @@ -0,0 +1,16 @@ +define shorewall::providers( + $provider, + $number = '', + $mark = '', + $duplicate = 'main', + $interface = '', + $gateway = '', + $options = '', + $copy = '', + $order='100' +){ + shorewall::entry{"providers-${order}-${name}": + line => "# ${name}\n${provider} ${number} ${mark} ${duplicate} ${interface} ${gateway} ${options} ${copy}" + } +} + |