Use a connection URI for postgres monitoring

[chef.git] / cookbooks / db / recipes / master.rb

diff --git a/cookbooks/db/recipes/master.rb b/cookbooks/db/recipes/master.rb
index 70ae0e6736a8c7389b809b4517cffad26f638e48..5e51ca030478d2c2552ad796ef605a5a394f2969 100644 (file)
--- a/cookbooks/db/recipes/master.rb
+++ b/cookbooks/db/recipes/master.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: db
+# Cookbook:: db

 # Recipe:: master
 #
 # Recipe:: master
 #

-# 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,


@@ -80,12 +80,9 @@ end
 postgresql_extension "btree_gist" do
   cluster node[:db][:cluster]
   database "openstreetmap"
 postgresql_extension "btree_gist" do
   cluster node[:db][:cluster]
   database "openstreetmap"

-  only_if { node[:postgresql][:clusters][node[:db][:cluster]] and node[:postgresql][:clusters][node[:db][:cluster]][:version] >= 9.0 }
+  only_if { node[:postgresql][:clusters][node[:db][:cluster]] && node[:postgresql][:clusters][node[:db][:cluster]][:version] >= 9.0 }

 end
 
 end
 

-template "/etc/cron.daily/rails-db" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0755
+file "/etc/cron.daily/rails-db" do
+  action :delete

 end
 end