X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/238a31cadd90bb63a5dbdc7f4406aa51d786cc9d..036734d15e6cd4fbc57e031ceca870f6c90e53bf:/cookbooks/planet/recipes/default.rb

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index c4ad10ecd..b83d3449b 100644
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -19,12 +19,13 @@
 
 include_recipe "accounts"
 include_recipe "apache"
+include_recipe "geoipupdate"
+include_recipe "planet::aws"
 include_recipe "munin"
-include_recipe "awscli"
 
 package %w[
-  perl
-  php-cli
+  python3
+  python3-geoip2
 ]
 
 remote_directory "/store/planet#html" do
@@ -51,7 +52,7 @@ end
 
 remote_directory node[:planet][:dump][:xml_history_directory] do
   source "history_cgi"
-  owner "www-data"
+  owner "planet"
   group "planet"
   mode "775"
   files_owner "root"
@@ -61,7 +62,7 @@ end
 
 remote_directory "/store/planet/cc-by-sa" do
   source "ccbysa_cgi"
-  owner "www-data"
+  owner "planet"
   group "planet"
   mode "775"
   files_owner "root"
@@ -71,7 +72,7 @@ end
 
 remote_directory "/store/planet/cc-by-sa/full-experimental" do
   source "ccbysa_history_cgi"
-  owner "www-data"
+  owner "planet"
   group "planet"
   mode "775"
   files_owner "root"
@@ -82,20 +83,20 @@ 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 "775"
   end
 end
 
 directory "/store/planet/notes" do
-  owner "www-data"
+  owner "planet"
   group "planet"
   mode "775"
 end
 
 directory "/store/planet/statistics" do
-  owner "www-data"
+  owner "planet"
   group "planet"
   mode "775"
 end
@@ -108,6 +109,14 @@ template "/usr/local/bin/apache-latest-planet-filename" do
   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
+
 apache_module "cgid"
 apache_module "rewrite"
 apache_module "proxy_http"
@@ -141,7 +150,7 @@ end
 systemd_service "planet-file-cleanup" do
   description "Cleanup old planet files"
   exec_start "/usr/local/bin/planet-file-cleanup --debug"
-  user "www-data"
+  user "planet"
   sandbox true
   read_write_paths [
     node[:planet][:dump][:xml_directory],