Update piwik to 3.1.0

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 28bf482735766231596f8d1dfa345e9483fa9b32..5d4e063cd4b3000a8071e8a4b3167aac00f6dc93 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -17,23 +17,20 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "perl"
 package "pbzip2"
 package "osmosis"
 
-if node[:lsb][:release].to_f >= 16.04
-  package "php-cli"
-else
-  package "php5-cli"
-end
+package "php-cli"
 
 file "/etc/cron.d/planet" do
   action :delete
 end
 
-remote_directory "/store/planet" do
+remote_directory "/store/planet#html" do
+  path "/store/planet"
   source "html"
   owner "root"
   group "root"
@@ -43,7 +40,8 @@ remote_directory "/store/planet" do
   files_mode 0o644
 end
 
-remote_directory "/store/planet" do
+remote_directory "/store/planet#cgi" do
+  path "/store/planet"
   source "cgi"
   owner "root"
   group "root"
@@ -57,7 +55,7 @@ remote_directory node[:planet][:dump][:xml_history_directory] do
   source "history_cgi"
   owner "www-data"
   group "planet"
-  mode 0o755
+  mode 0o775
   files_owner "root"
   files_group "root"
   files_mode 0o755
@@ -89,6 +87,11 @@ apache_module "cgid"
 apache_module "rewrite"
 apache_module "proxy_http"
 
+ssl_certificate "planet.openstreetmap.org" do
+  domains ["planet.openstreetmap.org", "planet.osm.org"]
+  notifies :reload, "service[apache2]"
+end
+
 apache_site "planet.openstreetmap.org" do
   template "apache.erb"
 end