From f3f78ebaf5f3fd3233bc35596fefb51f6e5ed9d9 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 13 Jun 2016 20:11:23 +0200 Subject: Notify Exec[shorewall_check] not Service[shorew..] Latest shorewall module does `shorewall check` (executed by `Exec[shorewall_check]`) so every related resource change must notify this Exec instead of `Service[shorewall]` as before. --- puppet/modules/site_shorewall/manifests/defaults.pp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'puppet/modules/site_shorewall/manifests/defaults.pp') diff --git a/puppet/modules/site_shorewall/manifests/defaults.pp b/puppet/modules/site_shorewall/manifests/defaults.pp index ceb17868..725e0880 100644 --- a/puppet/modules/site_shorewall/manifests/defaults.pp +++ b/puppet/modules/site_shorewall/manifests/defaults.pp @@ -1,3 +1,4 @@ +# Configure basic firewall rules for shorewall class site_shorewall::defaults { include shorewall @@ -55,7 +56,7 @@ class site_shorewall::defaults { mode => '0644', source => 'puppet:///modules/site_shorewall/Debian/shorewall.service', require => Package['shorewall'], - notify => Service['shorewall'], + notify => Exec['shorewall_check'], } ~> Exec['systemctl-daemon-reload'] @@ -66,14 +67,14 @@ class site_shorewall::defaults { lens => 'Shellvars.lns', incl => '/etc/shorewall/shorewall.conf', require => Package['shorewall'], - notify => Service['shorewall']; + notify => Exec['shorewall_check']; # require that the interface exist 'shorewall_REQUIRE_INTERFACE': changes => 'set /files/etc/shorewall/shorewall.conf/REQUIRE_INTERFACE Yes', lens => 'Shellvars.lns', incl => '/etc/shorewall/shorewall.conf', require => Package['shorewall'], - notify => Service['shorewall']; + notify => Exec['shorewall_check']; # configure shorewall-init 'shorewall-init': changes => 'set /files/etc/default/shorewall-init/PRODUCTS shorewall', -- cgit v1.2.3