supybot: fix planet-dump-ng commit link typo

[chef.git] / cookbooks / planet / recipes / default.rb

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index f7e090ac2e6e1dc129def9c63d59feb31d9857bb..ad532f93e40eb49cdcce73323508924054ebf53d 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -19,12 +19,12 @@
 
 include_recipe "accounts"
 include_recipe "apache"
 
 include_recipe "accounts"
 include_recipe "apache"

-include_recipe "munin"
-include_recipe "awscli"
+include_recipe "geoipupdate"
+include_recipe "planet::aws"

 
 package %w[
 
 package %w[

-  perl
-  php-cli
+  python3
+  python3-geoip2

 ]
 
 remote_directory "/store/planet#html" do
 ]
 
 remote_directory "/store/planet#html" do


@@ -108,6 +108,14 @@ template "/usr/local/bin/apache-latest-planet-filename" do
   notifies :restart, "service[apache2]"
 end
 
   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"
 apache_module "cgid"
 apache_module "rewrite"
 apache_module "proxy_http"


@@ -129,8 +137,6 @@ template "/etc/logrotate.d/apache2" do
   mode "644"
 end
 
   mode "644"
 end
 

-munin_plugin "planet_age"
-

 template "/usr/local/bin/planet-file-cleanup" do
   source "planet-file-cleanup.erb"
   owner "root"
 template "/usr/local/bin/planet-file-cleanup" do
   source "planet-file-cleanup.erb"
   owner "root"