imagery: remove layer yml on delete

[chef.git] / cookbooks / munin / recipes / server.rb

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index bb5ba243aeeb0973e6ca3882a0f26da5c8adb0b1..dcff8686032dcd6738ff05c382d4f61e4c943405 100644 (file)
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -27,13 +27,13 @@ template "/etc/default/rrdcached" do
   source "rrdcached.erb"
   owner "root"
   group "root"
   source "rrdcached.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 directory "/var/lib/munin/rrdcached" do
   owner "munin"
   group "munin"
 end
 
 directory "/var/lib/munin/rrdcached" do
   owner "munin"
   group "munin"

-  mode 0755
+  mode 0o755

 end
 
 service "rrdcached" do
 end
 
 service "rrdcached" do


@@ -62,7 +62,7 @@ template "/etc/munin/munin.conf" do
   source "munin.conf.erb"
   owner "root"
   group "root"
   source "munin.conf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   variables :expiry_time => expiry_time, :clients => clients,
             :frontends => frontends, :backends => backends,
             :tilecaches => tilecaches, :renderers => renderers,
   variables :expiry_time => expiry_time, :clients => clients,
             :frontends => frontends, :backends => backends,
             :tilecaches => tilecaches, :renderers => renderers,


@@ -71,15 +71,16 @@ end
 
 apache_module "fcgid"
 apache_module "rewrite"
 
 apache_module "fcgid"
 apache_module "rewrite"

+apache_module "headers"

 
 remote_directory "/srv/munin.openstreetmap.org" do
   source "www"
   owner "root"
   group "root"
 
 remote_directory "/srv/munin.openstreetmap.org" do
   source "www"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

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

-  files_mode 0755
+  files_mode 0o644

   purge true
 end
 
   purge true
 end
 


@@ -91,7 +92,7 @@ template "/etc/cron.daily/munin-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 munin_plugin "munin_stats"
 end
 
 munin_plugin "munin_stats"