summaryrefslogtreecommitdiff
path: root/manifests/interface.pp
AgeCommit message (Collapse)Author
2012-06-20fix another merge issueMicah 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-08-04refactor things to use the concat moduleMarcel Haerry
2010-12-16Internal refactoring of shorewall::interfaceintrigeri
... for more consistent options management. The public API does not change.
2010-12-16New add_options parameter to shorewall::interface.intrigeri
2010-10-17Merge remote branch 'riseup/master'intrigeri
Conflicts: files/debian/default manifests/init.pp templates/debian/default templates/debian_default.erb
2009-12-07factored everything out in its own fileMarcel Haerry