Age | Commit message (Collapse) | Author |
|
This reverts commit 6bc54f031b9ae12fe428c83e70733c8b2ff4c67a.
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 0c28fa636653f395c756f56c93f8c78fddfcee00.
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 6cb88973f53aa7d92414797dd21952c1c1d5da98.
|
|
/etc/puppet/modules/shorewall/manifests/init.pp:39"
This reverts commit f072fb5d41026d8b4b5125f8d249b687225cb108.
|
|
This reverts commit 6cb88973f53aa7d92414797dd21952c1c1d5da98.
|
|
This reverts commit d3eb5ffc325bd13e103dc72143f78c050e149d29.
|
|
|
|
/etc/puppet/modules/shorewall/manifests/init.pp:39
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
files/debian/default
manifests/init.pp
templates/debian/default
templates/debian_default.erb
|
|
|
|
|
|
|
|
|
|
|
|
instead of shorewall (which is dummy package for shorewall-shell anyway).
|
|
|
|
$fileserver/shorewall location. this enables you to put these files in
your local fileserver area, without modifying the shorewall module. if
you dont need to do this, then the shorewall module defaults will be used instead
|
|
|
|
|
|
template out the startup value in the debian/default so that it can be specified in puppet
make it possible to specify a different shorewall version if desired, default is to use 'present'
add additional documentation and move copyright information up to the top
|
|
puppet modes
|
|
|
|
changelog
|
|
|
|
|
|
Using entries in the form of order-title instead of order-name. As
happen in cases such as hosts defined as 'eth0:0.0.0.0/0', the '/' will
make the first portion to be understood as a folder. Making use of the
resource title as part of the file name and leaving the resource name to
the content can prevent this error.
|
|
|
|
|
|
git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@2855 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
|
|
git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1873 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
|
|
git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1870 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
|
|
git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1851 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
|
|
git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1850 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
|
|
git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1849 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
|
|
git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1848 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
|
|
git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1844 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
|
|
git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1842 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
|
|
git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1638 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
|