Revert "Remove some redundant settings from chef server configuration"

This reverts commit 26b959ed598073e88ad23403cbcb3623476342d9.

diff --git a/cookbooks/chef/templates/default/server.rb.erb b/cookbooks/chef/templates/default/server.rb.erb
index d155f5bbb949c6ad5616574783848b10e9504250..e7b9e0e9e01766b537b470fb48cc8f628a2fb195 100644 (file)
--- a/cookbooks/chef/templates/default/server.rb.erb
+++ b/cookbooks/chef/templates/default/server.rb.erb
@@ -5,6 +5,9 @@ default_orgname "openstreetmap"
 
 addons['install'] = false
 
 
 addons['install'] = false
 

+bookshelf['url'] = "https://chef.openstreetmap.org:443"
+bookshelf['vip'] = "chef.openstreetmap.org"
+

 lb['api_fqdn'] = "chef.openstreetmap.org"
 lb['web_ui_fqdn'] = "chef.openstreetmap.org"
 
 lb['api_fqdn'] = "chef.openstreetmap.org"
 lb['web_ui_fqdn'] = "chef.openstreetmap.org"