Update planet cookbook for Ubuntu 16.04

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 0c5c235b7cd4dfcb7362e551ec008b7702cdb34d..07ea2d51c82293efd67d62a892ad55df5e1b7338 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -20,10 +20,15 @@
 include_recipe "apache::ssl"
 
 package "perl"
-package "php5-cli"
 package "pbzip2"
 package "osmosis"
 
+if node[:lsb][:release].to_f >= 16.04
+  package "php-cli"
+else
+  package "php5-cli"
+end
+
 template "/etc/cron.d/planet" do
   source "cron.erb"
   owner "root"
@@ -83,8 +88,8 @@ template "/usr/local/bin/apache-latest-planet-filename" do
   mode 0755
 end
 
+apache_module "cgid"
 apache_module "rewrite"
-apache_module "proxy"
 apache_module "proxy_http"
 
 apache_site "planet.openstreetmap.org" do