Fix package dependencies in planet cookbook

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 28bf482735766231596f8d1dfa345e9483fa9b32..ba5bf0023011b29c8f114f69143079fb52828f44 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: planet
+# Cookbook:: planet
 # Recipe:: default
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,23 +17,19 @@
 # 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 %w[
+  perl
+  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 +39,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 +54,17 @@ 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
+end
+
+remote_directory "/store/planet/cc-by-sa/full-experimental" do
+  source "ccbysa_history_cgi"
+  owner "www-data"
+  group "planet"
+  mode 0o775
   files_owner "root"
   files_group "root"
   files_mode 0o755
@@ -83,11 +90,18 @@ template "/usr/local/bin/apache-latest-planet-filename" do
   owner "root"
   group "root"
   mode 0o755
+  notifies :restart, "service[apache2]"
 end
 
 apache_module "cgid"
 apache_module "rewrite"
 apache_module "proxy_http"
+apache_module "ratelimit"
+
+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"
@@ -101,3 +115,17 @@ template "/etc/logrotate.d/apache2" do
 end
 
 munin_plugin "planet_age"
+
+template "/usr/local/bin/old-planet-file-cleanup" do
+  source "old-planet-file-cleanup.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+template "/etc/cron.d/old-planet-file-cleanup" do
+  source "old-planet-file-cleanup.cron.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end