From 11c88124f503b07033fe7540aa7b916ebb2a0b62 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 28 Jun 2013 10:30:00 +0200 Subject: [PATCH] Do not use "su" in logrotate on squeeze --- modules/dacs/manifests/init.pp | 2 +- .../common/dacs.logrotate => templates/dacs.logrotate.erb} | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) rename modules/dacs/{files/common/dacs.logrotate => templates/dacs.logrotate.erb} (81%) diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp index f1d5496a..3eb93920 100644 --- a/modules/dacs/manifests/init.pp +++ b/modules/dacs/manifests/init.pp @@ -39,7 +39,7 @@ class dacs { purge => true } file { '/etc/logrotate.d/dacs': - source => 'puppet:///modules/dacs/common/dacs.logrotate', + content => template('dacs/dacs.logrotate.erb'), owner => root, group => root, mode => '0644', diff --git a/modules/dacs/files/common/dacs.logrotate b/modules/dacs/templates/dacs.logrotate.erb similarity index 81% rename from modules/dacs/files/common/dacs.logrotate rename to modules/dacs/templates/dacs.logrotate.erb index 789e3344..5587631c 100644 --- a/modules/dacs/files/common/dacs.logrotate +++ b/modules/dacs/templates/dacs.logrotate.erb @@ -11,6 +11,10 @@ compress delaycompress create 640 www-data www-data +<% if @lsbmajdistrelease >= '7' -%> su root www-data +<% else -%> + notifempty +<% end -%> sharedscripts } -- 2.39.2