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/base.pp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index b5899fc..db6852a 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -8,14 +8,14 @@ class shorewall::base {
   # This file has to be managed in place, so shorewall can find it
   file {
     '/etc/shorewall/shorewall.conf':
-      require => Package[shorewall],
-      notify  => Service[shorewall],
+      require => Package['shorewall'],
+      notify  => Exec['shorewall_check'],
       owner   => 'root',
       group   => 'root',
       mode    => '0644';
     '/etc/shorewall/puppet':
       ensure  => directory,
-      require => Package[shorewall],
+      require => Package['shorewall'],
       owner   => 'root',
       group   => 'root',
       mode    => '0644';
@@ -33,11 +33,16 @@ class shorewall::base {
       changes => 'set /files/etc/shorewall/shorewall.conf/CONFIG_PATH \'"/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"\'',
       lens    => 'Shellvars.lns',
       incl    => '/etc/shorewall/shorewall.conf',
-      notify  => Service['shorewall'],
+      notify  => Exec['shorewall_check'],
       require => Package['shorewall'];
     }
   }
 
+  exec{'shorewall_check':
+    command     => 'shorewall check',
+    refreshonly => true,
+    notify      => Service['shorewall'],
+  }
   service{'shorewall':
     ensure      => running,
     enable      => true,
-- 
cgit v1.2.3