]> gitweb.fluxo.info Git - puppet-shorewall.git/log
puppet-shorewall.git
9 years agoMerge remote-tracking branch 'shared/master' into develop master
Silvio Rhatto [Wed, 23 Mar 2016 23:01:11 +0000 (20:01 -0300)]
Merge remote-tracking branch 'shared/master' into develop

Conflicts:
manifests/tunnel.pp

10 years agoMerge branch 'immerda_changes' into 'master' shared
Micah [Wed, 9 Dec 2015 14:41:31 +0000 (14:41 +0000)]
Merge branch 'immerda_changes' into 'master'

Immerda changes

See merge request !5

10 years agolinting for future parser
mh [Sat, 28 Nov 2015 16:41:51 +0000 (17:41 +0100)]
linting for future parser

10 years agocheck shorewall daily on problems to alert if a rule won't compile
mh [Fri, 20 Nov 2015 22:01:37 +0000 (23:01 +0100)]
check shorewall daily on problems to alert if a rule won't compile

10 years agolinting
mh [Fri, 20 Nov 2015 21:45:59 +0000 (22:45 +0100)]
linting

10 years agomake service restart more failsafe
mh [Fri, 20 Nov 2015 21:43:06 +0000 (22:43 +0100)]
make service restart more failsafe

10 years agoadd razor rules
mh [Tue, 7 Apr 2015 12:32:07 +0000 (14:32 +0200)]
add razor rules

10 years agomake it possible to create resources from hiera
mh [Fri, 17 Oct 2014 10:44:51 +0000 (12:44 +0200)]
make it possible to create resources from hiera

10 years agoupdate a few headers
mh [Fri, 17 Oct 2014 10:30:38 +0000 (12:30 +0200)]
update a few headers

10 years agoDeprecated
Sylvain Veyrié [Tue, 16 Sep 2014 13:40:38 +0000 (15:40 +0200)]
Deprecated

10 years agoNon string mode is now deprecated
Sylvain Veyrié [Tue, 16 Sep 2014 13:28:50 +0000 (15:28 +0200)]
Non string mode is now deprecated

10 years agofix the missing include
mh [Fri, 11 Jul 2014 14:36:58 +0000 (16:36 +0200)]
fix the missing include

10 years agoget rid off lsb facts
mh [Wed, 9 Jul 2014 21:25:46 +0000 (23:25 +0200)]
get rid off lsb facts

10 years agoindentation
mh [Fri, 13 Jun 2014 07:40:09 +0000 (09:40 +0200)]
indentation

10 years agothere might be people who don't have a stun server
mh [Fri, 13 Jun 2014 07:39:38 +0000 (09:39 +0200)]
there might be people who don't have a stun server

10 years agolinting
mh [Fri, 13 Jun 2014 07:38:36 +0000 (09:38 +0200)]
linting

10 years agoa cleaner naming
mh [Fri, 13 Jun 2014 07:37:54 +0000 (09:37 +0200)]
a cleaner naming

10 years agoadd rule for stun
o [Wed, 11 Jun 2014 20:15:39 +0000 (22:15 +0200)]
add rule for stun

10 years agoadd rule for openvpn
o [Thu, 19 Dec 2013 18:51:45 +0000 (19:51 +0100)]
add rule for openvpn

10 years agomanage new and legacy ports of managesieve
mh [Sat, 28 Sep 2013 13:16:21 +0000 (15:16 +0200)]
manage new and legacy ports of managesieve

10 years agoadd rules for pyzor
mh [Sun, 22 Sep 2013 16:12:09 +0000 (18:12 +0200)]
add rules for pyzor

10 years agomake it easier to override behaviour of the dns rules
mh [Sun, 25 Aug 2013 16:44:45 +0000 (18:44 +0200)]
make it easier to override behaviour of the dns rules

10 years agoThe augeas module is not needed, but the concat module is
Sylvain Veyrié [Tue, 20 Aug 2013 13:36:49 +0000 (15:36 +0200)]
The augeas module is not needed, but the concat module is

10 years agofix define
mh [Sat, 10 Aug 2013 13:19:36 +0000 (15:19 +0200)]
fix define

10 years agomigrate ipsec rules to a define so we can specify multiple zones
mh [Sat, 10 Aug 2013 13:15:17 +0000 (15:15 +0200)]
migrate ipsec rules to a define so we can specify multiple zones

10 years agoonly manage the config_path if we do not manage the config file
mh [Thu, 28 Feb 2013 19:38:07 +0000 (20:38 +0100)]
only manage the config_path if we do not manage the config file

10 years agouse the centos class on centos based systems
mh [Thu, 28 Feb 2013 18:45:41 +0000 (19:45 +0100)]
use the centos class on centos based systems

10 years agowith the latest updates on EL6 this is needed
mh [Thu, 28 Feb 2013 18:28:28 +0000 (19:28 +0100)]
with the latest updates on EL6 this is needed

10 years agoMerge branch 'master' into 'master'
ng [Sat, 28 Nov 2015 16:56:48 +0000 (16:56 +0000)]
Merge branch 'master' into 'master'

Remove 'require augeas' (#4396)

Because the puppet 'require' keyword actually instantiates a class,
having 'require augeas' in base.pp means that you cannot instantiate the
augeas class anywhere else in your manifests, for example with some
optional parameters to the class. If you do, you will get a duplicate
definition error.

The README already says that the augeas module is required. It seems
better that this is managed outside of the module, allowing for
class parameter flexibility.

See merge request !3

10 years agoMerge branch 'feature/mangle-support-multiple-rules-with-same-action' into 'master'
Micah [Fri, 9 Oct 2015 19:00:24 +0000 (19:00 +0000)]
Merge branch 'feature/mangle-support-multiple-rules-with-same-action' into 'master'

Feature/mangle support multiple rules with same action

This allows one to support multiple networks in libvirt.

See merge request !4

10 years agoshorewall::rules::libvirt::host: adjust to changes in shorewall::mangle.
intrigeri [Thu, 16 Jul 2015 12:36:11 +0000 (12:36 +0000)]
shorewall::rules::libvirt::host: adjust to changes in shorewall::mangle.

That is, make the resource's title more unique by including the destination
interface in it, and accordingly pass the desired action via the new,
dedicated parameter.

10 years agoshorewall::mangle: allow specifying the ACTION explicitly.
intrigeri [Thu, 16 Jul 2015 12:34:54 +0000 (12:34 +0000)]
shorewall::mangle: allow specifying the ACTION explicitly.

Previously, it was using $name, which prevented adding multiple mangle
rules that share a common ACTION, with different parameters.

10 years agofixed code indentation, added gitlab shared remote
varac [Wed, 8 Jul 2015 09:04:57 +0000 (11:04 +0200)]
fixed code indentation, added gitlab shared remote

10 years agomoved README to README.md so it hopefully renders as markdown in gitlab now
varac [Wed, 8 Jul 2015 09:00:12 +0000 (11:00 +0200)]
moved README to README.md so it hopefully renders as markdown in gitlab now

10 years agoprovide a class ordering hint for augeas setup
Micah Anderson [Tue, 19 May 2015 17:01:09 +0000 (13:01 -0400)]
provide a class ordering hint for augeas setup

10 years agoRemove 'require augeas' (#4396)
Micah Anderson [Tue, 19 May 2015 16:54:53 +0000 (12:54 -0400)]
Remove 'require augeas' (#4396)

Because the puppet 'require' keyword actually instantiates a class,
having 'require augeas' in base.pp means that you cannot instantiate the
augeas class anywhere else in your manifests, for example with some
optional parameters to the class. If you do, you will get a duplicate
definition error.

The README already says that the augeas module is required. It seems
better that this is managed outside of the module, allowing for
class parameter flexibility.

10 years agoMake sure MUNINCOLLECTOR join() gets an array in munin rule
Jerome Charaoui [Fri, 8 May 2015 20:00:21 +0000 (16:00 -0400)]
Make sure MUNINCOLLECTOR join() gets an array in munin rule

10 years agoAdd GPLv3 license
Micah Anderson [Fri, 17 Apr 2015 15:31:08 +0000 (11:31 -0400)]
Add GPLv3 license

10 years agoMerge branch 'bugfix/Fix_DHCP_for_libvirt' into 'master'
Jerome Charaoui [Mon, 2 Mar 2015 15:37:58 +0000 (15:37 +0000)]
Merge branch 'bugfix/Fix_DHCP_for_libvirt' into 'master'

Fix dhcp for libvirt

This branch uses the mangle table support added by the feature/Add_support_for_mangle_table branch to fix the libvirt DHCP when broken by recent kernel. It fills the checksum of this kind of packets on the libvirt interface.

This patch shouldn't break older setup, and is implemented so that it can be disabled.

See merge request !2

10 years agoMerge branch 'feature/Add_support_for_mangle_table' into 'master'
Jerome Charaoui [Mon, 2 Mar 2015 15:37:31 +0000 (15:37 +0000)]
Merge branch 'feature/Add_support_for_mangle_table' into 'master'

Add support for mangle table.

When using the kernel from Debian Wheezy-backports (3.16.0-0.bpo.4-amd64), we encoutered a bug where shorewall was breaking the libvirt DHCP if restarted after it.

It seems that one has to add a rule in the POSTROUTING chain of the mangle table to --checksum-fill the DHCP packets for them to be properly catch by the VMs DHCP clients.

So we had to add support of the mangle table to the shared puppet module to fix that.

This patch does just that, and is meant to be used by the other branch I'll propose after.

See merge request !1

10 years agoFix DHCP from $vmz.
bertagaz [Thu, 15 Jan 2015 11:33:41 +0000 (12:33 +0100)]
Fix DHCP from $vmz.

On newer kernel (tested on 3.16), the libvirt and shorewall iptables
rules have conflicts that need to be fixed by enabling back
--checksum-fill on $vmz, otherwise the VMs can't get a DHCP lease.

10 years agoAdd support for the mangle table.
bertagaz [Fri, 27 Feb 2015 14:15:16 +0000 (15:15 +0100)]
Add support for the mangle table.

12 years agoMerge remote-tracking branch 'intrigeri/feature/libvirt-host'
Micah Anderson [Fri, 14 Jun 2013 17:27:03 +0000 (13:27 -0400)]
Merge remote-tracking branch 'intrigeri/feature/libvirt-host'

12 years agoFix shorewall::rules::rsync source/destination
Silvio Rhatto [Sun, 31 Mar 2013 02:59:33 +0000 (23:59 -0300)]
Fix shorewall::rules::rsync source/destination

12 years agolinting
mh [Thu, 28 Feb 2013 19:40:38 +0000 (20:40 +0100)]
linting

12 years agoonly manage the config_path if we do not manage the config file
mh [Thu, 28 Feb 2013 19:38:07 +0000 (20:38 +0100)]
only manage the config_path if we do not manage the config file

12 years agolinting the init.pp
mh [Thu, 28 Feb 2013 18:51:06 +0000 (19:51 +0100)]
linting the init.pp

12 years agouse the centos class on centos based systems
mh [Thu, 28 Feb 2013 18:45:41 +0000 (19:45 +0100)]
use the centos class on centos based systems

12 years agowith the latest updates on EL6 this is needed
mh [Thu, 28 Feb 2013 18:28:28 +0000 (19:28 +0100)]
with the latest updates on EL6 this is needed

12 years agofixed leftovers from concat_file in rtrules.pp and tunnel.pp
varac [Sat, 2 Mar 2013 10:54:03 +0000 (11:54 +0100)]
fixed leftovers from concat_file in rtrules.pp and tunnel.pp

12 years agoremove the class requirement in the augeas block, it is handled by the top-level...
Micah Anderson [Sat, 23 Feb 2013 15:35:54 +0000 (10:35 -0500)]
remove the class requirement in the augeas block, it is handled by the top-level require

12 years agochange the 'include augeas' to a 'require augeas'
Micah Anderson [Sat, 23 Feb 2013 15:33:42 +0000 (10:33 -0500)]
change the 'include augeas' to a 'require augeas'

12 years agoadd requirement for augeas module
Micah Anderson [Wed, 20 Feb 2013 16:30:26 +0000 (11:30 -0500)]
add requirement for augeas module

12 years agoaugeas definition needs to make sure the shorewall package is installed before it...
Micah Anderson [Tue, 12 Feb 2013 18:02:20 +0000 (13:02 -0500)]
augeas definition needs to make sure the shorewall package is installed before it tries to run

12 years agoLinting.
intrigeri [Sat, 9 Feb 2013 15:43:50 +0000 (16:43 +0100)]
Linting.

12 years agoAllow not setting up masquerading in libvirt::host.
intrigeri [Sat, 9 Feb 2013 15:35:45 +0000 (16:35 +0100)]
Allow not setting up masquerading in libvirt::host.

12 years agolibvirt::host: make debproxy port configurable.
intrigeri [Sat, 9 Feb 2013 15:34:22 +0000 (16:34 +0100)]
libvirt::host: make debproxy port configurable.

13 years agoUpdate shorewall::tunnel to concat module
Silvio Rhatto [Sat, 26 Jan 2013 01:32:55 +0000 (23:32 -0200)]
Update shorewall::tunnel to concat module

13 years agofix missing dependency on augeas
Micah Anderson [Thu, 24 Jan 2013 21:03:26 +0000 (16:03 -0500)]
fix missing dependency on augeas

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

13 years agoDefault order fo shorewall::rule and shorewall::policy (fix)
Silvio Rhatto [Fri, 18 Jan 2013 18:30:48 +0000 (16:30 -0200)]
Default order fo shorewall::rule and shorewall::policy (fix)

13 years agoDefault order fo shorewall::rule and shorewall::policy --config
Silvio Rhatto [Fri, 18 Jan 2013 18:28:47 +0000 (16:28 -0200)]
Default order fo shorewall::rule and shorewall::policy --config

13 years agocleanup a merge issue
mh [Wed, 2 Jan 2013 19:12:40 +0000 (20:12 +0100)]
cleanup a merge issue

13 years agoprovide an easy option to still manage the source of the central conf file
mh [Wed, 2 Jan 2013 18:46:52 +0000 (19:46 +0100)]
provide an easy option to still manage the source of the central conf file

13 years agoMerge remote-tracking branch 'riseup/master'
mh [Wed, 2 Jan 2013 18:46:18 +0000 (19:46 +0100)]
Merge remote-tracking branch 'riseup/master'

Conflicts:
files/shorewall.conf.CentOS.6
files/shorewall.conf.Debian.wheezy

13 years agoMerge remote-tracking branch 'varac/master'
mh [Wed, 2 Jan 2013 18:34:31 +0000 (19:34 +0100)]
Merge remote-tracking branch 'varac/master'

Conflicts:
files/boilerplate/providers.footer
files/boilerplate/providers.header
manifests/base.pp
manifests/providers.pp

13 years agoMerge remote-tracking branch 'sarava/master'
mh [Wed, 2 Jan 2013 18:15:34 +0000 (19:15 +0100)]
Merge remote-tracking branch 'sarava/master'

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

13 years agoRevert "Support exempting some users from torification measures."
intrigeri [Wed, 2 Jan 2013 17:02:31 +0000 (18:02 +0100)]
Revert "Support exempting some users from torification measures."

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.

13 years agoRevert "Allow redirecting DNS requests to Tor for specific users or globally."
intrigeri [Wed, 2 Jan 2013 17:01:43 +0000 (18:01 +0100)]
Revert "Allow redirecting DNS requests to Tor for specific users or globally."

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.

13 years agoMerge remote-tracking branch 'immerda/master'
intrigeri [Wed, 2 Jan 2013 16:59:32 +0000 (17:59 +0100)]
Merge remote-tracking branch 'immerda/master'

13 years agomake it possible to exent nets for ipsec
mh [Tue, 1 Jan 2013 15:22:55 +0000 (16:22 +0100)]
make it possible to exent nets for ipsec

13 years agoMerge remote-tracking branch 'immerda/master'
intrigeri [Sun, 30 Dec 2012 13:40:44 +0000 (14:40 +0100)]
Merge remote-tracking branch 'immerda/master'

13 years agoBecause the puppet shorewall module uses concat::fragment assembly to put the
Micah Anderson [Tue, 11 Dec 2012 23:42:15 +0000 (18:42 -0500)]
Because the puppet shorewall module uses concat::fragment assembly to put the
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.

13 years agoactually it is not possible to provide the site-shorewall sources for
Micah Anderson [Tue, 4 Dec 2012 20:39:15 +0000 (15:39 -0500)]
actually it is not possible to provide the site-shorewall sources for
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

13 years agoStop shipping the default shorewall.conf file, instead we should let the
Micah Anderson [Tue, 4 Dec 2012 20:20:13 +0000 (15:20 -0500)]
Stop shipping the default shorewall.conf file, instead we should let the
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

13 years agoMerge branch 'feature/libvirt-host'
intrigeri [Sun, 2 Dec 2012 10:30:26 +0000 (11:30 +0100)]
Merge branch 'feature/libvirt-host'

13 years agolibvirt::host: don't accept FTP from VMs.
intrigeri [Sun, 2 Dec 2012 10:29:22 +0000 (11:29 +0100)]
libvirt::host: don't accept FTP from VMs.

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.

13 years agoadded provider
varac [Sun, 25 Nov 2012 17:27:33 +0000 (18:27 +0100)]
added provider

13 years agortrules: added default priority
varac [Sun, 25 Nov 2012 17:27:20 +0000 (18:27 +0100)]
rtrules: added default priority

13 years agoadd rtrules
varac [Sun, 25 Nov 2012 16:49:37 +0000 (17:49 +0100)]
add rtrules

13 years agoUpdate Wheezy's shorewall.conf to use the new configuration directory.
intrigeri [Sun, 11 Nov 2012 22:21:28 +0000 (23:21 +0100)]
Update Wheezy's shorewall.conf to use the new configuration directory.

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

13 years agoMerge branch 'feature/torify-dns' into old-master
intrigeri [Sun, 11 Nov 2012 22:12:47 +0000 (23:12 +0100)]
Merge branch 'feature/torify-dns' into old-master

13 years agoMerge branch 'feature/torification-exception' into old-master
intrigeri [Sun, 11 Nov 2012 22:12:41 +0000 (23:12 +0100)]
Merge branch 'feature/torification-exception' into old-master

13 years agoMerge branch 'feature/libvirt-host' into old-master
intrigeri [Sun, 11 Nov 2012 22:12:14 +0000 (23:12 +0100)]
Merge branch 'feature/libvirt-host' into old-master

13 years agoSupport exempting some users from torification measures.
intrigeri [Sat, 7 Jan 2012 05:09:54 +0000 (06:09 +0100)]
Support exempting some users from torification measures.

13 years agoAllow redirecting DNS requests to Tor for specific users or globally.
intrigeri [Sat, 7 Jan 2012 14:23:47 +0000 (15:23 +0100)]
Allow redirecting DNS requests to Tor for specific users or globally.

13 years agoImport rough libvirt::host class.
intrigeri [Thu, 24 May 2012 19:25:10 +0000 (21:25 +0200)]
Import rough libvirt::host class.

13 years agoMerge remote-tracking branch 'riseup/master' into tmp
intrigeri [Sun, 11 Nov 2012 22:10:20 +0000 (23:10 +0100)]
Merge remote-tracking branch 'riseup/master' into tmp

Conflicts:
manifests/init.pp

13 years agoadd ipsec_nat rule port 4500
Andreas [Wed, 3 Oct 2012 01:28:05 +0000 (20:28 -0500)]
add ipsec_nat rule port 4500

13 years agoupdate to latest upstream
mh [Thu, 12 Jul 2012 23:32:12 +0000 (19:32 -0400)]
update to latest upstream

13 years agoput config file back to immerda version
Micah Anderson [Wed, 20 Jun 2012 20:17:37 +0000 (16:17 -0400)]
put config file back to immerda version

13 years agofix config path, I think I merged that wrong
Micah Anderson [Wed, 20 Jun 2012 20:00:46 +0000 (16:00 -0400)]
fix config path, I think I merged that wrong

13 years agoRevert "Support exempting some users from torification measures."
Micah Anderson [Wed, 20 Jun 2012 18:24:54 +0000 (14:24 -0400)]
Revert "Support exempting some users from torification measures."

This reverts commit 6cb88973f53aa7d92414797dd21952c1c1d5da98.

13 years agoRevert "fix for: Syntax error at [; expected ] at /etc/puppet/modules/shorewall/manif...
Micah Anderson [Wed, 20 Jun 2012 18:24:44 +0000 (14:24 -0400)]
Revert "fix for: Syntax error at [; expected ] at /etc/puppet/modules/shorewall/manifests/init.pp:39"

This reverts commit f072fb5d41026d8b4b5125f8d249b687225cb108.

13 years agochanges in extension scripts should notify shorewall for a restart
Micah Anderson [Wed, 20 Jun 2012 18:20:23 +0000 (14:20 -0400)]
changes in extension scripts should notify shorewall for a restart

13 years agoupdate extension-script to use a simple file resource, instead of doing a managed...
Micah Anderson [Wed, 20 Jun 2012 18:18:22 +0000 (14:18 -0400)]
update extension-script to use a simple file resource, instead of doing a managed file since it is never a fragement

13 years agoupdate additions to concat module that were not in immerda branch
Micah Anderson [Wed, 20 Jun 2012 18:05:32 +0000 (14:05 -0400)]
update additions to concat module that were not in immerda branch

13 years agofix for an incorrect merge
Micah Anderson [Wed, 20 Jun 2012 18:00:52 +0000 (14:00 -0400)]
fix for an incorrect merge

13 years agofix another merge issue
Micah Anderson [Wed, 20 Jun 2012 17:57:24 +0000 (13:57 -0400)]
fix another merge issue

13 years agoRevert "Support exempting some users from torification measures."
Micah Anderson [Wed, 20 Jun 2012 17:47:45 +0000 (13:47 -0400)]
Revert "Support exempting some users from torification measures."

This reverts commit 6cb88973f53aa7d92414797dd21952c1c1d5da98.

13 years agoRevert "fix for:"
Micah Anderson [Wed, 20 Jun 2012 17:47:40 +0000 (13:47 -0400)]
Revert "fix for:"

This reverts commit d3eb5ffc325bd13e103dc72143f78c050e149d29.