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 f4a1dc96927a6e2fab409510f4e7761386feb396..bccbb0fcf11a3fca95f431d0ffae851b3873dcbf 100644 (file)
--- a/cookbooks/planet/recipes/notes.rb
+++ b/cookbooks/planet/recipes/notes.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: planet
+# Cookbook:: planet

 # Recipe:: notes
 #
 # Recipe:: notes
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -21,18 +21,23 @@ include_recipe "git"
 
 db_passwords = data_bag_item("db", "passwords")
 
 
 db_passwords = data_bag_item("db", "passwords")
 

-package "python-psycopg2"
-package "python-lxml"
+package %w[
+  pbzip2
+  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
   action :sync
 end
 
 git "/opt/planet-notes-dump" do
   action :sync

-  repository "git://github.com/openstreetmap/planet-notes-dump.git"
+  repository "https://github.com/openstreetmap/planet-notes-dump.git"
+  depth 1

   user "root"
   group "root"
 end
   user "root"
   group "root"
 end


@@ -41,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