Merge remote-tracking branch 'github/pull/349' into master

[chef.git] / cookbooks / web / attributes / default.rb

diff --git a/cookbooks/web/attributes/default.rb b/cookbooks/web/attributes/default.rb
index 8ad59e5440da90c27e221518b68e409c94f96424..7c995d9d818b65c54deb345986ce2a46cc8742a7 100644 (file)
--- a/cookbooks/web/attributes/default.rb
+++ b/cookbooks/web/attributes/default.rb
@@ -1,3 +1,6 @@
 default[:web][:base_directory] = "/srv/www.openstreetmap.org"
-default[:web][:pid_directory] = "/var/run/web"
+default[:web][:pid_directory] = "/run/web"
 default[:web][:log_directory] = "/var/log/web"
+default[:web][:primary_cluster] = false
+
+default[:accounts][:users][:rails][:status] = :role