X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/57d0912302e16609980df8129f09085cf9d4efba..e48fab1439736d27ef70d0b56b09c71215fe7d27:/cookbooks/planet/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 925915f2e..baa4ccedc 100644
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -8,7 +8,7 @@
 # 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,36 +17,114 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "perl"
-package "php5-cli"
 package "pbzip2"
 package "osmosis"
 
-remote_directory "/usr/local/bin" do
-  source "bin"
+package "php-cli"
+
+file "/etc/cron.d/planet" do
+  action :delete
+end
+
+remote_directory "/store/planet#html" do
+  path "/store/planet"
+  source "html"
   owner "root"
   group "root"
-  mode 0755
+  mode "0755"
   files_owner "root"
   files_group "root"
-  files_mode 0755
+  files_mode 0o644
 end
 
-template "/etc/cron.d/planet" do
-  source "cron.erb"
+remote_directory "/store/planet#cgi" do
+  path "/store/planet"
+  source "cgi"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o755
+  files_owner "root"
+  files_group "root"
+  files_mode 0o755
+end
+
+remote_directory node[:planet][:dump][:xml_history_directory] do
+  source "history_cgi"
+  owner "www-data"
+  group "planet"
+  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
+end
+
+[:xml_directory, :xml_history_directory,
+ :pbf_directory, :pbf_history_directory].each do |dir|
+  directory node[:planet][:dump][dir] do
+    owner "www-data"
+    group "planet"
+    mode 0o775
+  end
+end
+
+directory "/store/planet/notes" do
+  owner "www-data"
+  group "planet"
+  mode 0o775
 end
 
-apache_module "rewrite" do
-  conf "rewrite.conf.erb"
+template "/usr/local/bin/apache-latest-planet-filename" do
+  source "apache-latest-planet-filename.erb"
+  owner "root"
+  group "root"
+  mode 0o755
 end
 
+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
+
+template "/etc/logrotate.d/apache2" do
+  source "logrotate.apache.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+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