fixed leftovers from concat_file in rtrules.pp and tunnel.pp

diff --git a/manifests/rtrules.pp b/manifests/rtrules.pp
index 34e12b4c9acaaec009b8aa97904237d9a27707bd..3810f26d6ac5cfb7f2cbfe4de7fa086b1b6a7218 100644 (file)
--- 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 e0c71e7825e977358eaebd7a1e2dd27590c8f158..2cac9227a9fa6717d83468cd96b758a86a6de3f7 100644 (file)
--- 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}",
     }
 }