Merge remote branch 'riseup/master'

Conflicts:
	files/debian/default
	manifests/init.pp
	templates/debian/default
	templates/debian_default.erb

1 files changed, 14 insertions, 0 deletions

diff --git a/manifests/extension_script.pp b/manifests/extension_script.pp
new file mode 100644
index 0000000..2b9579c
--- /dev/null
+++ b/manifests/extension_script.pp
@@ -0,0 +1,14 @@
+# See http://shorewall.net/shorewall_extension_scripts.htm
+define extension_script($script = '') {
+    case $name {
+        'init', 'initdone', 'start', 'started', 'stop', 'stopped', 'clear', 'refresh', 'continue', 'maclog': {
+            shorewall::managed_file { "${name}": }
+            shorewall::entry { "${name}.d/500-${hostname}":
+                line => "${script}\n";
+            }
+        }
+        '', default: {
+            err("${name}: unknown shorewall extension script")
+        }
+    }
+}