From 220d7af45dc4b1c334e2d3f50f2bc8ab54139093 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 20 Nov 2015 22:43:06 +0100
Subject: make service restart more failsafe

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

(limited to 'manifests/extension_script.pp')

diff --git a/manifests/extension_script.pp b/manifests/extension_script.pp
index 569fcbf..4abc6b1 100644
--- a/manifests/extension_script.pp
+++ b/manifests/extension_script.pp
@@ -4,7 +4,7 @@ define shorewall::extension_script($script = '') {
         'init', 'initdone', 'start', 'started', 'stop', 'stopped', 'clear', 'refresh', 'continue', 'maclog': {
           file { "/etc/shorewall/puppet/${name}":
             content => "${script}\n",
-            notify => Service[shorewall];
+            notify  => Exec['shorewall_check'];
           }
         }
         '', default: {
-- 
cgit v1.2.3


From bbd82b23d8d5d7ef41f05bc6f4afc5ba400a91f4 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 20 Nov 2015 22:45:59 +0100
Subject: linting

---
 manifests/base.pp             | 10 +++++-----
 manifests/debian.pp           | 10 +++++-----
 manifests/extension_script.pp | 24 +++++++++++++-----------
 3 files changed, 23 insertions(+), 21 deletions(-)

(limited to 'manifests/extension_script.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index db6852a..41348ef 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -44,10 +44,10 @@ class shorewall::base {
     notify      => Service['shorewall'],
   }
   service{'shorewall':
-    ensure      => running,
-    enable      => true,
-    hasstatus   => true,
-    hasrestart  => true,
-    require     => Package['shorewall'],
+    ensure     => running,
+    enable     => true,
+    hasstatus  => true,
+    hasrestart => true,
+    require    => Package['shorewall'],
   }
 }
diff --git a/manifests/debian.pp b/manifests/debian.pp
index 326b42b..07176a3 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -1,11 +1,11 @@
+# debian specific things
 class shorewall::debian inherits shorewall::base {
   file{'/etc/default/shorewall':
-    content => template("shorewall/debian_default.erb"),
+    content => template('shorewall/debian_default.erb'),
     require => Package['shorewall'],
     notify  => Exec['shorewall_check'],
-    owner   => 'root', group => 'root', mode => '0644';
-  }
-  Service['shorewall']{
-    status => '/sbin/shorewall status'
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644';
   }
 }
diff --git a/manifests/extension_script.pp b/manifests/extension_script.pp
index 4abc6b1..80b83d3 100644
--- a/manifests/extension_script.pp
+++ b/manifests/extension_script.pp
@@ -1,14 +1,16 @@
 # See http://shorewall.net/shorewall_extension_scripts.htm
-define shorewall::extension_script($script = '') {
-    case $name {
-        'init', 'initdone', 'start', 'started', 'stop', 'stopped', 'clear', 'refresh', 'continue', 'maclog': {
-          file { "/etc/shorewall/puppet/${name}":
-            content => "${script}\n",
-            notify  => Exec['shorewall_check'];
-          }
-        }
-        '', default: {
-          err("${name}: unknown shorewall extension script")
-        }
+define shorewall::extension_script(
+  $script
+) {
+  case $name {
+    'init', 'initdone', 'start', 'started', 'stop', 'stopped', 'clear', 'refresh', 'continue', 'maclog': {
+      file { "/etc/shorewall/puppet/${name}":
+        content => "${script}\n",
+        notify  => Exec['shorewall_check'];
+      }
     }
+    default: {
+      err("${name}: unknown shorewall extension script")
+    }
+  }
 }
-- 
cgit v1.2.3