1. 20 Jun, 2012 3 commits
    • Micah Anderson's avatar
      fix for: · d3eb5ffc
      Micah Anderson authored
      err: Could not retrieve catalog from remote server: Error 400 on SERVER: Syntax error at '['; expected ']' at /etc/puppet/modules/shorewall/manifests/init.pp:39
      d3eb5ffc
    • 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
    • intrigeri's avatar
      6cb88973
  2. 18 Jun, 2012 1 commit
  3. 14 Jun, 2012 1 commit
  4. 08 Jun, 2012 1 commit
  5. 06 Jun, 2012 1 commit
  6. 10 Feb, 2012 1 commit
  7. 23 Dec, 2011 3 commits
  8. 22 Dec, 2011 4 commits
  9. 05 Nov, 2011 2 commits
  10. 04 Aug, 2011 10 commits
  11. 21 Jun, 2011 5 commits
  12. 20 Jun, 2011 1 commit
  13. 26 Apr, 2011 1 commit
  14. 25 Apr, 2011 1 commit
  15. 06 Mar, 2011 1 commit
  16. 01 Mar, 2011 2 commits
  17. 06 Feb, 2011 1 commit
  18. 03 Feb, 2011 1 commit