X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1c848471a16f9d1ee1fc8a327af110447ea1ef4c..41c12d39c2b042bc631108181de77a162a799d13:/cookbooks/db/recipes/master.rb?ds=inline diff --git a/cookbooks/db/recipes/master.rb b/cookbooks/db/recipes/master.rb index 70ae0e673..f6641fd18 100644 --- a/cookbooks/db/recipes/master.rb +++ b/cookbooks/db/recipes/master.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: db +# Cookbook:: db # 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 # -# 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, @@ -49,6 +49,7 @@ end postgresql_user "planetdiff" do cluster node[:db][:cluster] password passwords["planetdiff"] + replication true end postgresql_user "backup" do @@ -80,12 +81,9 @@ end 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 -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