summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-09-22add rules for pyzormh
2013-08-25make it easier to override behaviour of the dns rulesmh
2013-08-20The augeas module is not needed, but the concat module isSylvain Veyrié
2013-08-20Remove require for augeas, since it is provided with PuppetSylvain Veyrié
2013-08-10Merge remote-tracking branch 'immerda/master' into riseupMicah Anderson
2013-08-10fix definemh
2013-08-10migrate ipsec rules to a define so we can specify multiple zonesmh
2013-06-15Merge remote-tracking branch 'shared/master'mh
2013-06-14Change the 'require augeas' to instead be a class ordering hint.Micah Anderson
When the 'require augeas' was there, it would declare the augeas class, which would result in a duplicate definition when you have elsewhere something like this: $augeasversion = $::lsbdistcodename ? { squeeze => '0.10.0-1~bpo60+3', wheezy => latest } class { 'augeas': version => $augeasversion } changing it to an ordering parameter makes sure that it is installed and working before anything else happens
2013-06-14Merge branch 'master' into leapMicah Anderson
Conflicts: manifests/base.pp
2013-06-14Merge branch 'master' of ssh://code.leap.se/puppet_shorewall into leapMicah Anderson
2013-06-14Merge remote-tracking branch 'intrigeri/feature/libvirt-host'Micah Anderson
2013-03-23lintingmh
2013-03-23only manage the config_path if we do not manage the config filemh
2013-03-23linting the init.ppmh
2013-03-23use the centos class on centos based systemsmh
2013-03-23with the latest updates on EL6 this is neededmh
2013-03-02fixed leftovers from concat_file in rtrules.pp and tunnel.ppvarac
2013-03-02fixed leftovers from concat_file in rtrules.pp and tunnel.ppvarac
2013-02-28lintingmh
2013-02-28only manage the config_path if we do not manage the config filemh
2013-02-28linting the init.ppmh
2013-02-28use the centos class on centos based systemsmh
2013-02-28with the latest updates on EL6 this is neededmh
2013-02-23remove the class requirement in the augeas block, it is handled by the ↵Micah Anderson
top-level require
2013-02-23change the 'include augeas' to a 'require augeas'Micah Anderson
2013-02-20add requirement for augeas moduleMicah Anderson
2013-02-12Merge remote-tracking branch 'riseup/master'Micah Anderson
2013-02-12Merge remote-tracking branch 'riseup/master' into leapMicah Anderson
2013-02-12augeas definition needs to make sure the shorewall package is installed ↵Micah Anderson
before it tries to run
2013-02-09Linting.intrigeri
2013-02-09Allow not setting up masquerading in libvirt::host.intrigeri
2013-02-09libvirt::host: make debproxy port configurable.intrigeri
2013-01-24Merge remote-tracking branch 'riseup/master'Micah Anderson
Conflicts: manifests/base.pp
2013-01-24fix missing dependency on augeasMicah Anderson
make sure that the augeas class has been applied before attempting to do any augeas operations. without this, you will non-deterministically get: err: /Stage[main]/Shorewall::Base/Augeas[shorewall_module_config_path]: Could not evaluate: Save failed with return code false
2013-01-24make sure that the augeas class has been applied before attempting to do anyMicah Anderson
augeas operations. without this, you will non-deterministically get: err: /Stage[main]/Shorewall::Base/Augeas[shorewall_module_config_path]: Could not evaluate: Save failed with return code false
2013-01-02cleanup a merge issuemh
2013-01-02provide an easy option to still manage the source of the central conf filemh
2013-01-02Merge remote-tracking branch 'riseup/master'mh
Conflicts: files/shorewall.conf.CentOS.6 files/shorewall.conf.Debian.wheezy
2013-01-02Merge remote-tracking branch 'varac/master'mh
Conflicts: files/boilerplate/providers.footer files/boilerplate/providers.header manifests/base.pp manifests/providers.pp
2013-01-02Merge remote-tracking branch 'sarava/master'mh
Conflicts: manifests/base.pp manifests/init.pp
2013-01-02Revert "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-02Revert "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-02Merge remote-tracking branch 'immerda/master'intrigeri
2013-01-01make it possible to exent nets for ipsecmh
2012-12-30Merge remote-tracking branch 'immerda/master'intrigeri
2012-12-11Because the puppet shorewall module uses concat::fragment assembly to put theMicah 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-04actually it is not possible to provide the site-shorewall sources forMicah 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-04Stop shipping the default shorewall.conf file, instead we should let theMicah 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-02Merge branch 'feature/libvirt-host'intrigeri