• Micah Anderson's avatar
    Merge remote-tracking branch 'immerda/master' into riseup · 58543cc4
    Micah Anderson authored
    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
    58543cc4
base.pp 1.51 KB