| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
final results in /etc/shorewall/puppet, we have to make sure the shorewall.conf
is pointing to that directory to get those configurations. This commit fixes that.
|
|
shorewall.conf, because if they do not exist, you will get a puppet error.
this commit removes them, and updates the README to provide instructions for how
you can do it the old way, if you want
|
|
operatingsystem package install its default config (this lets us stop having to
keep this file updated), and instead tell people to configure their
shorewall.conf file using the augeas method.
It is possible still to distribute a shorewall.conf from a site-shorewall
directory, however if the file is distributed, then it is not possible to use
the augeas method.
https://labs.riseup.net/code/issues/2738
|
|
This reverts commit 6cb88973f53aa7d92414797dd21952c1c1d5da98.
|
|
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
|
|
|
|
|
|
|
|
place at the wrong place
|
|
|
|
|
|
Conflicts:
files/debian/default
manifests/init.pp
templates/debian/default
templates/debian_default.erb
|
|
|
|
|
|
|
|
|
|
|
