aboutsummaryrefslogtreecommitdiff
path: root/files/shorewall.conf.Debian.squeeze
AgeCommit message (Collapse)Author
2012-06-20fixup some merge gaffsMicah Anderson
2012-06-20Merge remote-tracking branch 'immerda/master' into riseupMicah Anderson
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
2011-12-23correct config file for squeezemh
2011-12-23remove a couple of not yet supported optionsmh
2011-12-23add squeeze config filemh
2010-12-16Import Debian Squeeze's shorewall.conf.intrigeri