Bump cookstyle from 6.20.1 to 6.20.2

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index a7bc0002270e3a54e1d56ef5026e7c4da6bcb826..b99b4ab0b54174e18cc4540d73c2c6c16efd277f 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,48 +17,55 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "accounts"
+include_recipe "apache"
+include_recipe "munin"

 
 

-package "perl"
-package "php5-cli"
-package "pbzip2"
-package "osmosis"
+package %w[
+  perl
+  php-cli
+]

 
 

-template "/etc/cron.d/planet" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0644
-end
-
-remote_directory "/store/planet" do
+remote_directory "/store/planet#html" do
+  path "/store/planet"

   source "html"
   owner "root"
   group "root"
   mode "0755"
   files_owner "root"
   files_group "root"
   source "html"
   owner "root"
   group "root"
   mode "0755"
   files_owner "root"
   files_group "root"

-  files_mode 0644
+  files_mode "644"

 end
 
 end
 

-remote_directory "/store/planet" do
+remote_directory "/store/planet#cgi" do
+  path "/store/planet"

   source "cgi"
   owner "root"
   group "root"
   source "cgi"
   owner "root"
   group "root"

-  mode 0755
+  mode "755"

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0755
+  files_mode "755"

 end
 
 remote_directory node[:planet][:dump][:xml_history_directory] do
   source "history_cgi"
   owner "www-data"
   group "planet"
 end
 
 remote_directory node[:planet][:dump][:xml_history_directory] do
   source "history_cgi"
   owner "www-data"
   group "planet"

-  mode 0755
+  mode "775"

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0755
+  files_mode "755"
+end
+
+remote_directory "/store/planet/cc-by-sa/full-experimental" do
+  source "ccbysa_history_cgi"
+  owner "www-data"
+  group "planet"
+  mode "775"
+  files_owner "root"
+  files_group "root"
+  files_mode "755"

 end
 
 [:xml_directory, :xml_history_directory,
 end
 
 [:xml_directory, :xml_history_directory,


@@ -66,18 +73,33 @@ end
   directory node[:planet][:dump][dir] do
     owner "www-data"
     group "planet"
   directory node[:planet][:dump][dir] do
     owner "www-data"
     group "planet"

-    mode 0775
+    mode "775"

   end
 end
 
 directory "/store/planet/notes" do
   owner "www-data"
   group "planet"
   end
 end
 
 directory "/store/planet/notes" do
   owner "www-data"
   group "planet"

-  mode 0775
+  mode "775"
+end
+
+template "/usr/local/bin/apache-latest-planet-filename" do
+  source "apache-latest-planet-filename.erb"
+  owner "root"
+  group "root"
+  mode "755"
+  notifies :restart, "service[apache2]"

 end
 
 end
 

+apache_module "cgid"

 apache_module "rewrite"
 apache_module "proxy_http"
 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"
 
 apache_site "planet.openstreetmap.org" do
   template "apache.erb"


@@ -87,7 +109,24 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
   source "logrotate.apache.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode "644"

 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 "755"
+end
+
+cron_d "old-planet-file-cleanup" do
+  comment "run this on the first monday of the month at 3:44am"
+  minute "44"
+  hour "3"
+  day "1-7"
+  user "www-data"
+  command "test $(date +\\%u) -eq 1 && /usr/local/bin/old-planet-file-cleanup --debug"
+  mailto "zerebubuth@gmail.com"
+end