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 cb2ff26f30b61e379b59e23efcf2b00ef2b06463..5d4e063cd4b3000a8071e8a4b3167aac00f6dc93 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -17,35 +17,90 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 
 package "perl"
 
 package "perl"

-package "php5-cli"
+package "pbzip2"

 package "osmosis"
 
 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"
   owner "root"
   group "root"

-  mode 0755
+  mode "0755"

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

-  files_mode 0755
+  files_mode 0o644

 end
 
 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"
   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
+
+[: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
 
 end
 

-apache_module "rewrite" do
-  conf "rewrite.conf.erb"
+directory "/store/planet/notes" do
+  owner "www-data"
+  group "planet"
+  mode 0o775

 end
 
 end
 

+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"
 
 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
 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"