Merge remote-tracking branch 'github/pull/447'

[chef.git] / cookbooks / planet / recipes / notes.rb

diff --git a/cookbooks/planet/recipes/notes.rb b/cookbooks/planet/recipes/notes.rb
index 3b22af7397ecf2cbe077eccb1d21eee3019c0fb1..bccbb0fcf11a3fca95f431d0ffae851b3873dcbf 100644 (file)
--- a/cookbooks/planet/recipes/notes.rb
+++ b/cookbooks/planet/recipes/notes.rb
@@ -23,14 +23,15 @@ db_passwords = data_bag_item("db", "passwords")
 
 package %w[
   pbzip2
 
 package %w[
   pbzip2

-  python-psycopg2
-  python-lxml
+  python3
+  python3-psycopg2
+  python3-lxml

 ]
 
 directory "/opt/planet-notes-dump" do
   owner "root"
   group "root"
 ]
 
 directory "/opt/planet-notes-dump" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 git "/opt/planet-notes-dump" do
 end
 
 git "/opt/planet-notes-dump" do


@@ -45,13 +46,23 @@ template "/usr/local/bin/planet-notes-dump" do
   source "planet-notes-dump.erb"
   owner "root"
   group "root"
   source "planet-notes-dump.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   variables :password => db_passwords["planetdump"]
 end
 
   variables :password => db_passwords["planetdump"]
 end
 

-template "/etc/cron.d/planet-notes-dump" do
-  source "planet-notes-dump.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+cron_d "planet-notes-dump" do
+  minute "0"
+  hour "3"
+  user "www-data"
+  command "/usr/local/bin/planet-notes-dump"
+  mailto "grant-smaug@firefishy.com"
+end
+
+cron_d "planet-notes-cleanup" do
+  comment "Delete Planet Notes dump files older than 8 days"
+  minute "10"
+  hour "8"
+  user "www-data"
+  command "find /store/planet/notes/20??/ -maxdepth 1 -type f -iname 'planet-notes-??????.osn*' -printf '\%T@ \%p\n' | sort -k 1nr | sed 's/^[^ ]* //' | tail -n +17 | xargs -r rm -f"
+  mailto "grant-smaug@firefishy.com"

 end
 end