diff options
| author | mh <mh@immerda.ch> | 2014-08-30 13:17:55 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-08-30 13:17:55 +0200 |
| commit | c80c781fa05f94ac1c8631e068af98a6839b0a4a (patch) | |
| tree | 546af9a3befaa6db2edc53d65344a7253dc8c07c | |
| parent | 7bd09350025f19c4e2e79bafe6e91896b646a6b9 (diff) | |
do privilege drop properly within cron
| -rw-r--r-- | manifests/master/dashboard.pp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/manifests/master/dashboard.pp b/manifests/master/dashboard.pp index e3d56b5..4cbee12 100644 --- a/manifests/master/dashboard.pp +++ b/manifests/master/dashboard.pp @@ -46,11 +46,11 @@ class puppet::master::dashboard( file{'/etc/cron.daily/puppet-dashboard_cleanup': content => "#/bin/bash cd /usr/share/puppet-dashboard -RAILS_ENV=production /usr/bin/rake reports:prune upto=1 unit=mon >> /usr/share/puppet-dashboard/log/cron.log -RAILS_ENV=production /usr/bin/rake reports:prune:orphaned >> /usr/share/puppet-dashboard/log/cron.log -RAILS_ENV=production /usr/bin/rake db:raw:optimize >> /usr/share/puppet-dashboard/log/cron.log\n", - owner => 'puppet-dashboard', - group => 'puppet-dashboard', +su - puppet-dashboard -s /bin/bash -c 'RAILS_ENV=production /usr/bin/rake reports:prune upto=1 unit=mon >> /usr/share/puppet-dashboard/log/cron.log' +su - puppet-dashboard -s /bin/bash -c 'RAILS_ENV=production /usr/bin/rake reports:prune:orphaned >> /usr/share/puppet-dashboard/log/cron.log' +su - puppet-dashboard -s /bin/bash -c 'RAILS_ENV=production /usr/bin/rake db:raw:optimize >> /usr/share/puppet-dashboard/log/cron.log'\n", + owner => 'root', + group => 0, mode => '0755', require => Service['puppet-dashboard-workers']; } @@ -60,7 +60,8 @@ RAILS_ENV=production /usr/bin/rake db:raw:optimize >> /usr/share/puppet-dashboar Service['puppet-dashboard']{ ensure => running, enable => true, - subscribe => File['/usr/share/puppet-dashboard/config/database.yml','/usr/share/puppet-dashboard/config/settings.yml'], + subscribe => File['/usr/share/puppet-dashboard/config/database.yml', + '/usr/share/puppet-dashboard/config/settings.yml'], } } else { Service['puppet-dashboard']{ |