GitLab

Conflicts:
	manifests/base.pp
	manifests/init.pp

This reverts commit 6bc54f03.

This stuff is not ready for the shared repo, but we want to take benefit from me
having already merged immerda's stuff into my branch and solved the conflicts.

This reverts commit 0c28fa63.

This stuff is not ready for the shared repo, but we want to take benefit from me
having already merged immerda's stuff into my branch and solved the conflicts.

It was meant to provide preseeding files over FTP,
but the Debian installer has been supporting TFTP for a while,
so no additional software is needed.

Managed configuration files now live in /etc/shorewall/puppet.

Conflicts:
	manifests/init.pp

This reverts commit 6cb88973.

Revert "fix for: Syntax error at [; expected ] at /etc/puppet/modules/shorewall/manifests/init.pp:39"

This reverts commit f072fb5d.

update extension-script to use a simple file resource, instead of doing a managed file since it is never a fragement

This reverts commit 6cb88973.

This reverts commit d3eb5ffc.

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

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