From cc0d83a493b3d3da7496ae0b1fc481b60b310334 Mon Sep 17 00:00:00 2001 From: Anders Dahlqvist Date: Wed, 15 Jun 2016 15:21:33 +0200 Subject: [PATCH 1/3] Use patch to /sbin/service command This is needed on suse11, at least when puppet-module-cron is used --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index cbd56e8..e1d2c5a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -415,7 +415,7 @@ 'create 640 root root', 'sharedscripts', 'postrotate', - ' service syslog reload > /dev/null', + ' /sbin/service syslog reload > /dev/null', 'endscript', ] } From 9da629af9ca34fadf889d3471f9d2a0868f6e43a Mon Sep 17 00:00:00 2001 From: Anders Dahlqvist Date: Wed, 15 Jun 2016 15:21:33 +0200 Subject: [PATCH 2/3] Use patch to /sbin/service command This is needed on suse11, at least when puppet-module-cron is used --- manifests/init.pp | 2 +- spec/fixtures/logrotate.suse10 | 2 +- spec/fixtures/logrotate.suse11 | 2 +- spec/fixtures/logrotate.suse12 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index cbd56e8..e1d2c5a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -415,7 +415,7 @@ 'create 640 root root', 'sharedscripts', 'postrotate', - ' service syslog reload > /dev/null', + ' /sbin/service syslog reload > /dev/null', 'endscript', ] } diff --git a/spec/fixtures/logrotate.suse10 b/spec/fixtures/logrotate.suse10 index 692e123..7c79eef 100644 --- a/spec/fixtures/logrotate.suse10 +++ b/spec/fixtures/logrotate.suse10 @@ -31,6 +31,6 @@ create 640 root root sharedscripts postrotate - service syslog reload > /dev/null + /sbin/service syslog reload > /dev/null endscript } diff --git a/spec/fixtures/logrotate.suse11 b/spec/fixtures/logrotate.suse11 index 692e123..7c79eef 100644 --- a/spec/fixtures/logrotate.suse11 +++ b/spec/fixtures/logrotate.suse11 @@ -31,6 +31,6 @@ create 640 root root sharedscripts postrotate - service syslog reload > /dev/null + /sbin/service syslog reload > /dev/null endscript } diff --git a/spec/fixtures/logrotate.suse12 b/spec/fixtures/logrotate.suse12 index 692e123..7c79eef 100644 --- a/spec/fixtures/logrotate.suse12 +++ b/spec/fixtures/logrotate.suse12 @@ -31,6 +31,6 @@ create 640 root root sharedscripts postrotate - service syslog reload > /dev/null + /sbin/service syslog reload > /dev/null endscript } From 643fd38cac8f204407c1e4124c958620c786757c Mon Sep 17 00:00:00 2001 From: Anders Dahlqvist Date: Thu, 16 Jun 2016 10:46:10 +0200 Subject: [PATCH 3/3] Fix indent Make travis happy --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index e1d2c5a..27fad01 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -415,7 +415,7 @@ 'create 640 root root', 'sharedscripts', 'postrotate', - ' /sbin/service syslog reload > /dev/null', + ' /sbin/service syslog reload > /dev/null', 'endscript', ] }