]> gitweb.fluxo.info Git - puppet-shorewall.git/commitdiff
fixed leftovers from concat_file in rtrules.pp and tunnel.pp
authorvarac <varacanero@zeromail.org>
Sat, 2 Mar 2013 10:54:03 +0000 (11:54 +0100)
committervarac <varacanero@zeromail.org>
Sat, 2 Mar 2013 10:57:22 +0000 (11:57 +0100)
manifests/rtrules.pp
manifests/tunnel.pp

index 34e12b4c9acaaec009b8aa97904237d9a27707bd..3810f26d6ac5cfb7f2cbfe4de7fa086b1b6a7218 100644 (file)
@@ -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}",
     }
 }
index e0c71e7825e977358eaebd7a1e2dd27590c8f158..2cac9227a9fa6717d83468cd96b758a86a6de3f7 100644 (file)
@@ -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}",
     }
 }