Update rubocop configuration for COP renames

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 33c01751b2d09e5348250aea8c4429b4c1ea85ef..b72d4d1c5434fed666563c7d5e61e8c2ae0621d7 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
 #
 # 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,17 +17,14 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "apache"

+include_recipe "munin"

 
 

-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
 
 file "/etc/cron.d/planet" do
   action :delete


@@ -65,6 +62,16 @@ remote_directory node[:planet][:dump][:xml_history_directory] do
   files_mode 0o755
 end
 
   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
+end
+

 [:xml_directory, :xml_history_directory,
  :pbf_directory, :pbf_history_directory].each do |dir|
   directory node[:planet][:dump][dir] do
 [:xml_directory, :xml_history_directory,
  :pbf_directory, :pbf_history_directory].each do |dir|
   directory node[:planet][:dump][dir] do


@@ -85,11 +92,13 @@ template "/usr/local/bin/apache-latest-planet-filename" do
   owner "root"
   group "root"
   mode 0o755
   owner "root"
   group "root"
   mode 0o755

+  notifies :restart, "service[apache2]"

 end
 
 apache_module "cgid"
 apache_module "rewrite"
 apache_module "proxy_http"
 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"]
 
 ssl_certificate "planet.openstreetmap.org" do
   domains ["planet.openstreetmap.org", "planet.osm.org"]


@@ -108,3 +117,17 @@ template "/etc/logrotate.d/apache2" do
 end
 
 munin_plugin "planet_age"
 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