diff options
| author | intrigeri <intrigeri@boum.org> | 2012-11-11 23:10:20 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2012-11-11 23:10:20 +0100 |
| commit | 8080f1a892a69dc171187c8165d7e81f5b5b512d (patch) | |
| tree | 6e610ec18aaa13f7797eedd08b03c852e49d8cfb /manifests/rules/puppet/master.pp | |
| parent | 911cc18e594bb5a3ab642ebb24615a0447050c32 (diff) | |
| parent | 5052233d92e97263eab292408ed2602db0836d98 (diff) | |
| download | puppet-shorewall-8080f1a892a69dc171187c8165d7e81f5b5b512d.tar.gz puppet-shorewall-8080f1a892a69dc171187c8165d7e81f5b5b512d.tar.bz2 | |
Merge remote-tracking branch 'riseup/master' into tmp
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/rules/puppet/master.pp')
| -rw-r--r-- | manifests/rules/puppet/master.pp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/manifests/rules/puppet/master.pp b/manifests/rules/puppet/master.pp index 8ef609f..925979c 100644 --- a/manifests/rules/puppet/master.pp +++ b/manifests/rules/puppet/master.pp @@ -1,11 +1,10 @@ class shorewall::rules::puppet::master { - include ::shorewall::rules::puppet - shorewall::rule { 'net-me-tcp_puppet-main': - source => 'net', - destination => '$FW', - proto => 'tcp', - destinationport => '$PUPPETSERVER_PORT,$PUPPETSERVER_SIGN_PORT', - order => 240, - action => 'ACCEPT'; - } + shorewall::rule { 'net-me-tcp_puppet-main': + source => 'net', + destination => '$FW', + proto => 'tcp', + destinationport => '$PUPPETSERVER_PORT,$PUPPETSERVER_SIGN_PORT', + order => 240, + action => 'ACCEPT'; + } } |