From: Tom Hughes <tom@compton.nu>
Date: Mon, 22 Jul 2024 14:05:42 +0000 (+0100)
Subject: Revert "Remove some redundant settings from chef server configuration"
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/d3b7066397b505ca5fbf4cd2d74763b9d86c6dda?ds=sidebyside;hp=ccd352f937f654318bf8a60c725bd16f64ca2d42

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 d155f5bbb..e7b9e0e9e 100644
--- 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
 
+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"