Use a connection URI for postgres monitoring

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 4ea86b7ac5d7d444090b5dcd41b921a6f13f89a3..b99b4ab0b54174e18cc4540d73c2c6c16efd277f 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -34,7 +34,7 @@ remote_directory "/store/planet#html" do
   mode "0755"
   files_owner "root"
   files_group "root"
   mode "0755"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 remote_directory "/store/planet#cgi" do
 end
 
 remote_directory "/store/planet#cgi" do


@@ -42,30 +42,30 @@ remote_directory "/store/planet#cgi" do
   source "cgi"
   owner "root"
   group "root"
   source "cgi"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

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

-  files_mode 0o755
+  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 0o775
+  mode "775"

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

-  files_mode 0o755
+  files_mode "755"

 end
 
 remote_directory "/store/planet/cc-by-sa/full-experimental" do
   source "ccbysa_history_cgi"
   owner "www-data"
   group "planet"
 end
 
 remote_directory "/store/planet/cc-by-sa/full-experimental" do
   source "ccbysa_history_cgi"
   owner "www-data"
   group "planet"

-  mode 0o775
+  mode "775"

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

-  files_mode 0o755
+  files_mode "755"

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


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

-    mode 0o775
+    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 0o775
+  mode "775"

 end
 
 template "/usr/local/bin/apache-latest-planet-filename" do
   source "apache-latest-planet-filename.erb"
   owner "root"
   group "root"
 end
 
 template "/usr/local/bin/apache-latest-planet-filename" do
   source "apache-latest-planet-filename.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   notifies :restart, "service[apache2]"
 end
 
   notifies :restart, "service[apache2]"
 end
 


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

-  mode 0o644
+  mode "644"

 end
 
 munin_plugin "planet_age"
 end
 
 munin_plugin "planet_age"


@@ -118,7 +118,7 @@ template "/usr/local/bin/old-planet-file-cleanup" do
   source "old-planet-file-cleanup.erb"
   owner "root"
   group "root"
   source "old-planet-file-cleanup.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 cron_d "old-planet-file-cleanup" do
 end
 
 cron_d "old-planet-file-cleanup" do


@@ -127,6 +127,6 @@ cron_d "old-planet-file-cleanup" do
   hour "3"
   day "1-7"
   user "www-data"
   hour "3"
   day "1-7"
   user "www-data"

-  command "test $(date +\%u) -eq 1 && /usr/local/bin/old-planet-file-cleanup --debug"
+  command "test $(date +\\%u) -eq 1 && /usr/local/bin/old-planet-file-cleanup --debug"

   mailto "zerebubuth@gmail.com"
 end
   mailto "zerebubuth@gmail.com"
 end