From e61e6805e5a8fe4e39b0c31631491c29f209357c Mon Sep 17 00:00:00 2001
From: Nick <nick@ivpn.net>
Date: Fri, 17 Apr 2015 12:54:57 +0200
Subject: Fix tunnels filename

---
 manifests/tunnel.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/tunnel.pp b/manifests/tunnel.pp
index 2cac922..0e645c8 100644
--- a/manifests/tunnel.pp
+++ b/manifests/tunnel.pp
@@ -5,7 +5,7 @@ define shorewall::tunnel(
     $gateway_zones = '',
     $order = '1'
 ) {
-    shorewall::entry { "tunnel-${order}-${name}":
+    shorewall::entry { "tunnels-${order}-${name}":
         line => "# ${name}\n${tunnel_type} ${zone} ${gateway} ${gateway_zones}",
     }
 }
-- 
cgit v1.2.3


From 07c863098f453d3ce67d64c2ac5c67d8cf4c6a25 Mon Sep 17 00:00:00 2001
From: Nick <nick@ivpn.net>
Date: Fri, 17 Apr 2015 12:59:19 +0200
Subject: Change tunnel managed file

---
 files/boilerplate/tunnel.footer  |  1 -
 files/boilerplate/tunnel.header  | 11 -----------
 files/boilerplate/tunnels.footer |  1 +
 files/boilerplate/tunnels.header | 11 +++++++++++
 manifests/init.pp                |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 files/boilerplate/tunnel.footer
 delete mode 100644 files/boilerplate/tunnel.header
 create mode 100644 files/boilerplate/tunnels.footer
 create mode 100644 files/boilerplate/tunnels.header

diff --git a/files/boilerplate/tunnel.footer b/files/boilerplate/tunnel.footer
deleted file mode 100644
index 5e12d1d..0000000
--- a/files/boilerplate/tunnel.footer
+++ /dev/null
@@ -1 +0,0 @@
-#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
diff --git a/files/boilerplate/tunnel.header b/files/boilerplate/tunnel.header
deleted file mode 100644
index 638fd56..0000000
--- a/files/boilerplate/tunnel.header
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Shorewall version 4 - Tunnels File
-#
-# For information about entries in this file, type "man shorewall-tunnels"
-#
-# The manpage is also online at
-# http://www.shorewall.net/manpages/shorewall-tunnels.html
-#
-###############################################################################
-#TYPE			ZONE	GATEWAY		GATEWAY
-#						ZONE
diff --git a/files/boilerplate/tunnels.footer b/files/boilerplate/tunnels.footer
new file mode 100644
index 0000000..5e12d1d
--- /dev/null
+++ b/files/boilerplate/tunnels.footer
@@ -0,0 +1 @@
+#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
diff --git a/files/boilerplate/tunnels.header b/files/boilerplate/tunnels.header
new file mode 100644
index 0000000..638fd56
--- /dev/null
+++ b/files/boilerplate/tunnels.header
@@ -0,0 +1,11 @@
+#
+# Shorewall version 4 - Tunnels File
+#
+# For information about entries in this file, type "man shorewall-tunnels"
+#
+# The manpage is also online at
+# http://www.shorewall.net/manpages/shorewall-tunnels.html
+#
+###############################################################################
+#TYPE			ZONE	GATEWAY		GATEWAY
+#						ZONE
diff --git a/manifests/init.pp b/manifests/init.pp
index f096d86..5966bed 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -92,7 +92,7 @@ class shorewall(
       # http://www.shorewall.net/manpages/shorewall-providers.html
       'providers',
       # See http://www.shorewall.net/manpages/shorewall-tunnels.html
-      'tunnel',
+      'tunnels',
       # See http://www.shorewall.net/MultiISP.html
       'rtrules',
     ]:;
-- 
cgit v1.2.3