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/irc.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/irc.pp')
| -rw-r--r-- | manifests/rules/out/irc.pp | 10 | 
1 files changed, 10 insertions, 0 deletions
diff --git a/manifests/rules/out/irc.pp b/manifests/rules/out/irc.pp new file mode 100644 index 0000000..9c8590a --- /dev/null +++ b/manifests/rules/out/irc.pp @@ -0,0 +1,10 @@ +class shorewall::rules::out::irc { +    shorewall::rule{'me-net-irc-tcp': +        source          => '$FW', +        destination     => 'net', +        proto           => 'tcp', +        destinationport => '6667', +        order           => 240, +        action          => 'ACCEPT'; +    } +}  | 
