X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d2c77f6ed8d42b2b1f02230795bba8d0d8591ff5..a8930abf977175e1034465cb4e93d4d3673e366c:/cookbooks/planet/recipes/default.rb?ds=inline diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb index 23dc7bdbf..ad532f93e 100644 --- a/cookbooks/planet/recipes/default.rb +++ b/cookbooks/planet/recipes/default.rb @@ -19,12 +19,12 @@ include_recipe "accounts" include_recipe "apache" -include_recipe "awscli" -include_recipe "munin" +include_recipe "geoipupdate" +include_recipe "planet::aws" package %w[ - perl - php-cli + python3 + python3-geoip2 ] remote_directory "/store/planet#html" do @@ -108,6 +108,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" @@ -129,8 +137,6 @@ template "/etc/logrotate.d/apache2" do mode "644" end -munin_plugin "planet_age" - template "/usr/local/bin/planet-file-cleanup" do source "planet-file-cleanup.erb" owner "root"