From fa6112aceeb092b2283cfaf3f937202c11354247 Mon Sep 17 00:00:00 2001 From: cvtienhoven Date: Mon, 8 Jun 2015 10:26:37 +0200 Subject: [PATCH 1/8] Update configuration.pp --- manifests/configuration.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/configuration.pp b/manifests/configuration.pp index 87c5f1a..ac30018 100644 --- a/manifests/configuration.pp +++ b/manifests/configuration.pp @@ -74,6 +74,6 @@ group => root, mode => '0640', require => Package['firewalld'], # make sure package is installed - notify => Service['firewalld'], # restart service + notify => Exec['firewalld::reload'], # reload service } } From 68c5c9107ad49e1808a18f8b51573ca69b83ffad Mon Sep 17 00:00:00 2001 From: cvtienhoven Date: Mon, 8 Jun 2015 10:27:14 +0200 Subject: [PATCH 2/8] Update configuration.pp --- manifests/configuration.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/configuration.pp b/manifests/configuration.pp index ac30018..ec7c882 100644 --- a/manifests/configuration.pp +++ b/manifests/configuration.pp @@ -64,7 +64,7 @@ group => root, mode => '0750', require => Package['firewalld'], # make sure package is installed - notify => Service['firewalld'], # restart service + notify => Exec['firewalld::reload'], # reload service } file { '/etc/firewalld/firewalld.conf': From 853754fcdfcb17c269813b812fda9b491bb0074f Mon Sep 17 00:00:00 2001 From: cvtienhoven Date: Mon, 8 Jun 2015 10:27:52 +0200 Subject: [PATCH 3/8] Update direct.pp --- manifests/direct.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/direct.pp b/manifests/direct.pp index a2ac8a9..b68c72a 100644 --- a/manifests/direct.pp +++ b/manifests/direct.pp @@ -89,6 +89,6 @@ group => root, mode => '0644', require => Package['firewalld'], - notify => Service['firewalld'], + notify => Exec['firewalld::reload'], # reload service } } From 613e450347381f4370ee6ddde2c4e4eb6499abb6 Mon Sep 17 00:00:00 2001 From: cvtienhoven Date: Mon, 8 Jun 2015 10:28:13 +0200 Subject: [PATCH 4/8] Update lockdown_whitelist.pp --- manifests/lockdown_whitelist.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/lockdown_whitelist.pp b/manifests/lockdown_whitelist.pp index c409724..e2d1d6f 100644 --- a/manifests/lockdown_whitelist.pp +++ b/manifests/lockdown_whitelist.pp @@ -63,6 +63,6 @@ group => root, mode => '0644', require => Package['firewalld'], - notify => Service['firewalld'], + notify => Exec['firewalld::reload'], # reload service } } From 477615b2bae8fb57942f66f3a457dabfd95f025b Mon Sep 17 00:00:00 2001 From: cvtienhoven Date: Mon, 8 Jun 2015 10:28:37 +0200 Subject: [PATCH 5/8] Update service.pp --- manifests/service.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/service.pp b/manifests/service.pp index 20d69f8..9c215b0 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -64,6 +64,6 @@ group => root, mode => '0644', require => Package['firewalld'], - notify => Service['firewalld'], + notify => Exec['firewalld::reload'], # reload service } } From 2c33c0e5dc5bb05185e359fea5ccaf31a3ba3d9a Mon Sep 17 00:00:00 2001 From: cvtienhoven Date: Mon, 8 Jun 2015 10:28:57 +0200 Subject: [PATCH 6/8] Update base.pp --- manifests/service/base.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/service/base.pp b/manifests/service/base.pp index 8a8f271..8d0ae63 100644 --- a/manifests/service/base.pp +++ b/manifests/service/base.pp @@ -30,6 +30,6 @@ group => root, mode => '0750', require => Package['firewalld'], - notify => Service['firewalld'], + notify => Exec['firewalld::reload'], # reload service } } From d65ca84b04ce1687a9d66b1d094c76320b183247 Mon Sep 17 00:00:00 2001 From: cvtienhoven Date: Mon, 8 Jun 2015 10:29:18 +0200 Subject: [PATCH 7/8] Update base.pp --- manifests/zone/base.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/zone/base.pp b/manifests/zone/base.pp index 35060aa..3b694d0 100644 --- a/manifests/zone/base.pp +++ b/manifests/zone/base.pp @@ -32,6 +32,6 @@ group => root, mode => '0750', require => Package['firewalld'], - notify => Service['firewalld'], + notify => Exec['firewalld::reload'], # reload service } } From 0b441b43342f129b8c43fe3f21e85bce26b942db Mon Sep 17 00:00:00 2001 From: cvtienhoven Date: Mon, 8 Jun 2015 10:26:37 +0200 Subject: [PATCH 8/8] Reload the service rather than restart the service --- manifests/configuration.pp | 4 ++-- manifests/direct.pp | 2 +- manifests/lockdown_whitelist.pp | 2 +- manifests/service.pp | 2 +- manifests/service/base.pp | 2 +- manifests/zone/base.pp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manifests/configuration.pp b/manifests/configuration.pp index 87c5f1a..ec7c882 100644 --- a/manifests/configuration.pp +++ b/manifests/configuration.pp @@ -64,7 +64,7 @@ group => root, mode => '0750', require => Package['firewalld'], # make sure package is installed - notify => Service['firewalld'], # restart service + notify => Exec['firewalld::reload'], # reload service } file { '/etc/firewalld/firewalld.conf': @@ -74,6 +74,6 @@ group => root, mode => '0640', require => Package['firewalld'], # make sure package is installed - notify => Service['firewalld'], # restart service + notify => Exec['firewalld::reload'], # reload service } } diff --git a/manifests/direct.pp b/manifests/direct.pp index a2ac8a9..b68c72a 100644 --- a/manifests/direct.pp +++ b/manifests/direct.pp @@ -89,6 +89,6 @@ group => root, mode => '0644', require => Package['firewalld'], - notify => Service['firewalld'], + notify => Exec['firewalld::reload'], # reload service } } diff --git a/manifests/lockdown_whitelist.pp b/manifests/lockdown_whitelist.pp index c409724..e2d1d6f 100644 --- a/manifests/lockdown_whitelist.pp +++ b/manifests/lockdown_whitelist.pp @@ -63,6 +63,6 @@ group => root, mode => '0644', require => Package['firewalld'], - notify => Service['firewalld'], + notify => Exec['firewalld::reload'], # reload service } } diff --git a/manifests/service.pp b/manifests/service.pp index 20d69f8..9c215b0 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -64,6 +64,6 @@ group => root, mode => '0644', require => Package['firewalld'], - notify => Service['firewalld'], + notify => Exec['firewalld::reload'], # reload service } } diff --git a/manifests/service/base.pp b/manifests/service/base.pp index 8a8f271..8d0ae63 100644 --- a/manifests/service/base.pp +++ b/manifests/service/base.pp @@ -30,6 +30,6 @@ group => root, mode => '0750', require => Package['firewalld'], - notify => Service['firewalld'], + notify => Exec['firewalld::reload'], # reload service } } diff --git a/manifests/zone/base.pp b/manifests/zone/base.pp index 35060aa..3b694d0 100644 --- a/manifests/zone/base.pp +++ b/manifests/zone/base.pp @@ -32,6 +32,6 @@ group => root, mode => '0750', require => Package['firewalld'], - notify => Service['firewalld'], + notify => Exec['firewalld::reload'], # reload service } }