diff options
| -rw-r--r-- | manifests/entry.pp | 2 | ||||
| -rw-r--r-- | manifests/rule.pp | 2 | ||||
| -rw-r--r-- | manifests/rules/gitdaemon/absent.pp | 5 | ||||
| -rw-r--r-- | manifests/rules/out/ssh/remove.pp | 5 |
4 files changed, 0 insertions, 14 deletions
diff --git a/manifests/entry.pp b/manifests/entry.pp index c8fffc7..ab61351 100644 --- a/manifests/entry.pp +++ b/manifests/entry.pp @@ -1,10 +1,8 @@ define shorewall::entry( - $ensure = present, $line ){ $parts = split($name,'-') concat::fragment{$name: - ensure => $ensure, content => "${line}\n", order => $parts[1], target => "/etc/shorewall/puppet/${parts[0]}", diff --git a/manifests/rule.pp b/manifests/rule.pp index 2fe91e2..b80c584 100644 --- a/manifests/rule.pp +++ b/manifests/rule.pp @@ -1,6 +1,5 @@ # mark is new in 3.4.4 define shorewall::rule( - $ensure = present, $action, $source, $destination, @@ -14,7 +13,6 @@ define shorewall::rule( $order ){ shorewall::entry{"rules-${order}-${name}": - ensure => $ensure, line => "# ${name}\n${action} ${source} ${destination} ${proto} ${destinationport} ${sourceport} ${originaldest} ${ratelimit} ${user} ${mark}", } } diff --git a/manifests/rules/gitdaemon/absent.pp b/manifests/rules/gitdaemon/absent.pp deleted file mode 100644 index ade6fba..0000000 --- a/manifests/rules/gitdaemon/absent.pp +++ /dev/null @@ -1,5 +0,0 @@ -class shorewall::rules::gitdaemon::absent inherits shorewall::rules::gitdaemon { - Shorewall::Rule['net-me-tcp_gitdaemon']{ - ensure => absent, - } -} diff --git a/manifests/rules/out/ssh/remove.pp b/manifests/rules/out/ssh/remove.pp deleted file mode 100644 index bc0acf3..0000000 --- a/manifests/rules/out/ssh/remove.pp +++ /dev/null @@ -1,5 +0,0 @@ -class shorewall::rules::out::ssh::remove inherits shorewall::rules::out::ssh { - Shorewall::Rule['me-net-tcp_ssh']{ - ensure => absent, - } -} |