X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..9cb89866d2aea9415aaebc184a5ffd5c467899d5:/cookbooks/planet/recipes/notes.rb?ds=sidebyside diff --git a/cookbooks/planet/recipes/notes.rb b/cookbooks/planet/recipes/notes.rb index f4a1dc969..3f0e2c996 100644 --- a/cookbooks/planet/recipes/notes.rb +++ b/cookbooks/planet/recipes/notes.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: planet +# Cookbook:: planet # 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 # -# 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, @@ -21,18 +21,23 @@ include_recipe "git" 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" - 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 @@ -41,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