aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-03-02 11:54:03 +0100
committervarac <varacanero@zeromail.org>2013-03-02 11:57:22 +0100
commite94521847665c88a53c5d9df4ec7b56d8e771535 (patch)
tree642feb68614df9683b99a2a018ebd913bfc145ba
parentd01a48cb5c3a73d281368d93c8f7a3fa45b3cd70 (diff)
downloadpuppet-shorewall-e94521847665c88a53c5d9df4ec7b56d8e771535.tar.gz
puppet-shorewall-e94521847665c88a53c5d9df4ec7b56d8e771535.tar.bz2
fixed leftovers from concat_file in rtrules.pp and tunnel.pp
-rw-r--r--manifests/rtrules.pp2
-rw-r--r--manifests/tunnel.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/rtrules.pp b/manifests/rtrules.pp
index 34e12b4..3810f26 100644
--- a/manifests/rtrules.pp
+++ b/manifests/rtrules.pp
@@ -5,7 +5,7 @@ define shorewall::rtrules(
$priority = '10000',
$mark,
){
- shorewall::entry { "rtrules.d/${mark}-${title}":
+ shorewall::entry { "rtrules-${mark}-${name}":
line => "# ${name}\n${source} ${destination} ${provider} ${priority} ${mark}",
}
}
diff --git a/manifests/tunnel.pp b/manifests/tunnel.pp
index e0c71e7..2cac922 100644
--- a/manifests/tunnel.pp
+++ b/manifests/tunnel.pp
@@ -5,7 +5,7 @@ define shorewall::tunnel(
$gateway_zones = '',
$order = '1'
) {
- shorewall::entry { "tunnel.d/${order}-${title}":
+ shorewall::entry { "tunnel-${order}-${name}":
line => "# ${name}\n${tunnel_type} ${zone} ${gateway} ${gateway_zones}",
}
}