Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-01-02 | cleanup a merge issue | mh | |
2013-01-02 | provide an easy option to still manage the source of the central conf file | mh | |
2013-01-02 | Merge remote-tracking branch 'riseup/master' | mh | |
Conflicts: files/shorewall.conf.CentOS.6 files/shorewall.conf.Debian.wheezy | |||
2013-01-02 | Merge remote-tracking branch 'varac/master' | mh | |
Conflicts: files/boilerplate/providers.footer files/boilerplate/providers.header manifests/base.pp manifests/providers.pp | |||
2013-01-02 | Merge remote-tracking branch 'sarava/master' | mh | |
Conflicts: manifests/base.pp manifests/init.pp | |||
2013-01-02 | Revert "Support exempting some users from torification measures." | intrigeri | |
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. | |||
2013-01-02 | Revert "Allow redirecting DNS requests to Tor for specific users or globally." | intrigeri | |
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. | |||
2013-01-02 | Merge remote-tracking branch 'immerda/master' | intrigeri | |
2013-01-01 | make it possible to exent nets for ipsec | mh | |
2012-12-30 | Merge remote-tracking branch 'immerda/master' | intrigeri | |
2012-12-11 | Because the puppet shorewall module uses concat::fragment assembly to put the | Micah Anderson | |
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. | |||
2012-12-04 | actually it is not possible to provide the site-shorewall sources for | Micah Anderson | |
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 | |||
2012-12-04 | Stop shipping the default shorewall.conf file, instead we should let the | Micah Anderson | |
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 | |||
2012-12-02 | Merge branch 'feature/libvirt-host' | intrigeri | |
2012-12-02 | libvirt::host: don't accept FTP from VMs. | intrigeri | |
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. | |||
2012-11-25 | added provider | varac | |
2012-11-25 | rtrules: added default priority | varac | |
2012-11-25 | add rtrules | varac | |
2012-11-11 | Update Wheezy's shorewall.conf to use the new configuration directory. | intrigeri | |
Managed configuration files now live in /etc/shorewall/puppet. | |||
2012-11-11 | Merge branch 'feature/torify-dns' into old-master | intrigeri | |
2012-11-11 | Merge branch 'feature/torification-exception' into old-master | intrigeri | |
2012-11-11 | Merge branch 'feature/libvirt-host' into old-master | intrigeri | |
2012-11-11 | Support exempting some users from torification measures. | intrigeri | |
2012-11-11 | Allow redirecting DNS requests to Tor for specific users or globally. | intrigeri | |
2012-11-11 | Import rough libvirt::host class. | intrigeri | |
2012-11-11 | Merge remote-tracking branch 'riseup/master' into tmp | intrigeri | |
Conflicts: manifests/init.pp | |||
2012-10-02 | add ipsec_nat rule port 4500 | Andreas | |
2012-07-12 | update to latest upstream | mh | |
2012-06-20 | put config file back to immerda version | Micah Anderson | |
2012-06-20 | fix config path, I think I merged that wrong | Micah Anderson | |
2012-06-20 | Revert "Support exempting some users from torification measures." | Micah Anderson | |
This reverts commit 6cb88973f53aa7d92414797dd21952c1c1d5da98. | |||
2012-06-20 | Revert "fix for: Syntax error at [; expected ] at ↵ | Micah Anderson | |
/etc/puppet/modules/shorewall/manifests/init.pp:39" This reverts commit f072fb5d41026d8b4b5125f8d249b687225cb108. | |||
2012-06-20 | changes in extension scripts should notify shorewall for a restart | Micah Anderson | |
2012-06-20 | update extension-script to use a simple file resource, instead of doing a ↵ | Micah Anderson | |
managed file since it is never a fragement | |||
2012-06-20 | update additions to concat module that were not in immerda branch | Micah Anderson | |
2012-06-20 | fix for an incorrect merge | Micah Anderson | |
2012-06-20 | fix another merge issue | Micah Anderson | |
2012-06-20 | Revert "Support exempting some users from torification measures." | Micah Anderson | |
This reverts commit 6cb88973f53aa7d92414797dd21952c1c1d5da98. | |||
2012-06-20 | Revert "fix for:" | Micah Anderson | |
This reverts commit d3eb5ffc325bd13e103dc72143f78c050e149d29. | |||
2012-06-20 | fixup some merge gaffs | Micah Anderson | |
2012-06-20 | fix for: Syntax error at [; expected ] at ↵ | Micah Anderson | |
/etc/puppet/modules/shorewall/manifests/init.pp:39 | |||
2012-06-20 | fix for: | Micah Anderson | |
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 | |||
2012-06-20 | Merge remote-tracking branch 'immerda/master' into riseup | Micah Anderson | |
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 | |||
2012-06-20 | Support exempting some users from torification measures. | intrigeri | |
2012-06-18 | the rest will be included already by the client | mh | |
2012-06-13 | migrate away from hiera stuff | mh | |
2012-06-08 | refactor things for >2.7 | mh | |
2012-06-06 | fix for new style for 2.7 | mh | |
2012-02-10 | get the order right | mh | |
2011-12-23 | do the link before the service | mh | |