X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1647548590878bfd153b8b8c74e73eda0b8a2cd3..e90801c889e9ae86e817edeef31659fd2b3a778f:/cookbooks/planet/recipes/default.rb diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb index 5dd5953f8..b83d3449b 100644 --- a/cookbooks/planet/recipes/default.rb +++ b/cookbooks/planet/recipes/default.rb @@ -17,17 +17,16 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "apache" +include_recipe "geoipupdate" +include_recipe "planet::aws" +include_recipe "munin" -package "perl" -package "pbzip2" -package "osmosis" - -package "php-cli" - -file "/etc/cron.d/planet" do - action :delete -end +package %w[ + python3 + python3-geoip2 +] remote_directory "/store/planet#html" do path "/store/planet" @@ -37,7 +36,7 @@ remote_directory "/store/planet#html" do mode "0755" files_owner "root" files_group "root" - files_mode 0o644 + files_mode "644" end remote_directory "/store/planet#cgi" do @@ -45,52 +44,76 @@ remote_directory "/store/planet#cgi" do source "cgi" owner "root" group "root" - mode 0o755 + mode "755" files_owner "root" files_group "root" - files_mode 0o755 + files_mode "755" end remote_directory node[:planet][:dump][:xml_history_directory] do source "history_cgi" - owner "www-data" + owner "planet" group "planet" - mode 0o775 + mode "775" files_owner "root" files_group "root" - files_mode 0o755 + files_mode "755" +end + +remote_directory "/store/planet/cc-by-sa" do + source "ccbysa_cgi" + owner "planet" + group "planet" + mode "775" + files_owner "root" + files_group "root" + files_mode "755" end remote_directory "/store/planet/cc-by-sa/full-experimental" do source "ccbysa_history_cgi" - owner "www-data" + owner "planet" group "planet" - mode 0o775 + mode "775" files_owner "root" files_group "root" - files_mode 0o755 + files_mode "755" end [:xml_directory, :xml_history_directory, :pbf_directory, :pbf_history_directory].each do |dir| directory node[:planet][:dump][dir] do - owner "www-data" + owner "planet" group "planet" - mode 0o775 + mode "775" end end directory "/store/planet/notes" do - owner "www-data" + owner "planet" + group "planet" + mode "775" +end + +directory "/store/planet/statistics" do + owner "planet" group "planet" - mode 0o775 + mode "775" end template "/usr/local/bin/apache-latest-planet-filename" do source "apache-latest-planet-filename.erb" owner "root" group "root" - mode 0o755 + mode "755" + notifies :restart, "service[apache2]" +end + +template "/usr/local/bin/apache-s3-ip2region" do + source "apache-s3-ip2region.erb" + owner "root" + group "root" + mode "755" notifies :restart, "service[apache2]" end @@ -112,21 +135,34 @@ template "/etc/logrotate.d/apache2" do source "logrotate.apache.erb" owner "root" group "root" - mode 0o644 + mode "644" end munin_plugin "planet_age" -template "/usr/local/bin/old-planet-file-cleanup" do - source "old-planet-file-cleanup.erb" +template "/usr/local/bin/planet-file-cleanup" do + source "planet-file-cleanup.erb" owner "root" group "root" - mode 0o755 + mode "755" end -template "/etc/cron.d/old-planet-file-cleanup" do - source "old-planet-file-cleanup.cron.erb" - owner "root" - group "root" - mode 0o644 +systemd_service "planet-file-cleanup" do + description "Cleanup old planet files" + exec_start "/usr/local/bin/planet-file-cleanup --debug" + user "planet" + sandbox true + read_write_paths [ + node[:planet][:dump][:xml_directory], + node[:planet][:dump][:pbf_directory] + ] +end + +systemd_timer "planet-file-cleanup" do + description "Cleanup old planet files" + on_calendar "Mon *-*-1..7 03:44" +end + +service "planet-file-cleanup.timer" do + action [:enable, :start] end