wordpress: Use DOS line ending. Disable WP auto updater

[chef.git] / cookbooks / nominatim / recipes / version4.rb

diff --git a/cookbooks/nominatim/recipes/version4.rb b/cookbooks/nominatim/recipes/version4.rb
index 19e3d1aa98ec8718d2f6cc7de378d2931629292b..7b218d9511324d6b876286bdb7a4ba79925f2072 100644 (file)
--- a/cookbooks/nominatim/recipes/version4.rb
+++ b/cookbooks/nominatim/recipes/version4.rb
@@ -64,6 +64,14 @@ postgis_version = node[:nominatim][:postgis]
 
 package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
 
+node[:nominatim][:dbadmins].each do |user|
+  postgresql_user user do
+    cluster node[:nominatim][:dbcluster]
+    superuser true
+    only_if { node[:nominatim][:state] != "slave" }
+  end
+end
+
 postgresql_user "nominatim" do
   cluster node[:nominatim][:dbcluster]
   superuser true
@@ -277,7 +285,7 @@ frontends = search(:node, "recipes:web\\:\\:frontend").sort_by(&:name)
 
 nginx_site "nominatim" do
   template "nginx.erb"
-  directory build_directory
+  directory project_directory
   variables :pools => node[:nominatim][:fpm_pools],
             :frontends => frontends,
             :confdir => "#{basedir}/etc",