From 4bedff602c690f3dd31cb4d06b7fbd83f208f101 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 4 Sep 2012 11:17:23 -0700
Subject: [PATCH] Run tmpreaper every six hours.

Run tmpreaper every six hours and remove files/directories more than 12
hours old.

Change-Id: Iba105c7defd950590c6ff437035830e741b9e16a
Reviewed-on: https://review.openstack.org/12372
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 modules/tmpreaper/files/tmpreaper.conf        |  2 +-
 .../{tmpreaper-cron.daily => tmpreaper.sh}    |  0
 modules/tmpreaper/manifests/init.pp           | 48 +++++++++++--------
 3 files changed, 30 insertions(+), 20 deletions(-)
 rename modules/tmpreaper/files/{tmpreaper-cron.daily => tmpreaper.sh} (100%)

diff --git a/modules/tmpreaper/files/tmpreaper.conf b/modules/tmpreaper/files/tmpreaper.conf
index 9b097dbadd..f93f97140f 100644
--- a/modules/tmpreaper/files/tmpreaper.conf
+++ b/modules/tmpreaper/files/tmpreaper.conf
@@ -43,4 +43,4 @@ TMPREAPER_PROTECT_EXTRA=''
 TMPREAPER_DIRS='/tmp/.'
 TMPREAPER_DELAY='256'
 TMPREAPER_ADDITIONALOPTIONS='--runtime=600'
-TMPREAPER_TIME=1d
+TMPREAPER_TIME=12h
diff --git a/modules/tmpreaper/files/tmpreaper-cron.daily b/modules/tmpreaper/files/tmpreaper.sh
similarity index 100%
rename from modules/tmpreaper/files/tmpreaper-cron.daily
rename to modules/tmpreaper/files/tmpreaper.sh
diff --git a/modules/tmpreaper/manifests/init.pp b/modules/tmpreaper/manifests/init.pp
index 3473aa7857..a42edddece 100644
--- a/modules/tmpreaper/manifests/init.pp
+++ b/modules/tmpreaper/manifests/init.pp
@@ -1,23 +1,33 @@
 class tmpreaper() {
-   package { 'tmpreaper':
-      ensure => present,
-   }
+  package { 'tmpreaper':
+    ensure => present,
+  }
 
-   file { 'tmpreaper-cron.daily':
-      name => '/etc/cron.daily/tmpreaper',
-      ensure => 'present',
-      owner => 'root',
-      group => 'root',
-      mode => 755,
-      source => 'puppet:///modules/tmpreaper/tmpreaper-cron.daily',
-   }
+  file { '/etc/cron.daily/tmpreaper':
+    ensure => absent
+  }
 
-   file { 'tmpreaper.conf':
-      name => '/etc/tmpreaper.conf',
-      ensure => 'present',
-      owner => 'root',
-      group => 'root',
-      mode => 644,
-      source => 'puppet:///modules/tmpreaper/tmpreaper.conf',
-   }
+  file { '/usr/local/bin/tmpreaper.sh':
+    ensure => 'present',
+    owner  => 'root',
+    group  => 'root',
+    mode   => 755,
+    source => 'puppet:///modules/tmpreaper/tmpreaper.sh',
+  }
+
+  file { '/etc/tmpreaper.conf':
+    ensure => 'present',
+    owner  => 'root',
+    group  => 'root',
+    mode   => 644,
+    source => 'puppet:///modules/tmpreaper/tmpreaper.conf',
+  }
+
+  cron { 'tmpreaper':
+    user    => 'root',
+    minute  => '42',
+    hour    => '*/6',
+    command => 'sleep $((RANDOM\\%60+60)) && /usr/local/bin/tmpreaper.sh',
+    require => File['/usr/local/bin/tmpreaper.sh'],
+  }
 }