X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/aa1f26f044f0f2238f1cb0fdf8ec0879bc44d639..3f3f6dcd9be7f5bccf22a4d4a2e7c72de6a9c636:/cookbooks/planet/recipes/notes.rb diff --git a/cookbooks/planet/recipes/notes.rb b/cookbooks/planet/recipes/notes.rb index c255c0962..3f0e2c996 100644 --- a/cookbooks/planet/recipes/notes.rb +++ b/cookbooks/planet/recipes/notes.rb @@ -23,19 +23,21 @@ db_passwords = data_bag_item("db", "passwords") package %w[ pbzip2 - python-psycopg2 - python-lxml + python3 + python3-psycopg2 + python3-lxml ] directory "/opt/planet-notes-dump" do owner "root" group "root" - mode 0o755 + mode "755" 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 @@ -44,13 +46,47 @@ template "/usr/local/bin/planet-notes-dump" do source "planet-notes-dump.erb" owner "root" group "root" - mode 0o755 + mode "755" variables :password => db_passwords["planetdump"] end -template "/etc/cron.d/planet-notes-dump" do - source "planet-notes-dump.cron.erb" +systemd_service "planet-notes-dump" do + description "Create notes dump" + exec_start "/usr/local/bin/planet-notes-dump" + user "www-data" + sandbox :enable_network => true + read_write_paths "/store/planet/notes" +end + +systemd_timer "planet-notes-dump" do + description "Create notes dump" + on_calendar "03:00" +end + +service "planet-notes-dump.timer" do + action [:enable, :start] +end + +template "/usr/local/bin/planet-notes-cleanup" do + source "planet-notes-cleanup.erb" owner "root" group "root" - mode 0o644 + mode "755" +end + +systemd_service "planet-notes-cleanup" do + description "Delete old notes dumps" + exec_start "/usr/local/bin/planet-notes-cleanup" + user "www-data" + sandbox true + read_write_paths "/store/planet/notes" +end + +systemd_timer "planet-notes-cleanup" do + description "Delete old notes dumps" + on_calendar "08:10" +end + +service "planet-notes-cleanup.timer" do + action [:enable, :start] end