Fix tile expiry

[chef.git] / cookbooks / chef / templates / default / server.rb.erb

diff --git a/cookbooks/chef/templates/default/server.rb.erb b/cookbooks/chef/templates/default/server.rb.erb
index 1ec1424d0ae8c52fa2d2ab750ebb83c8d9009b04..5abb4ccd781c3d688e5c6cbaef9e75eb486b0f7c 100644 (file)
--- a/cookbooks/chef/templates/default/server.rb.erb
+++ b/cookbooks/chef/templates/default/server.rb.erb
@@ -3,9 +3,12 @@
 nginx['enable_non_ssl'] = true
 nginx['non_ssl_port'] = 4000
 nginx['ssl_port'] = 4443
 nginx['enable_non_ssl'] = true
 nginx['non_ssl_port'] = 4000
 nginx['ssl_port'] = 4443

+nginx['ssl_certificate'] = '/etc/ssl/certs/openstreetmap.pem'
+nginx['ssl_certificate_key'] = '/etc/ssl/private/openstreetmap.key'

 nginx['server_name'] = "chef.openstreetmap.org"
 nginx['url'] = "http://chef.openstreetmap.org:4000"
 nginx['server_name'] = "chef.openstreetmap.org"
 nginx['url'] = "http://chef.openstreetmap.org:4000"

-bookshelf['url'] = "http://chef.openstreetmap.org:4000"
+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"
 bookshelf['vip'] = "chef.openstreetmap.org"
 lb['api_fqdn'] = "chef.openstreetmap.org"
 lb['web_ui_fqdn'] = "chef.openstreetmap.org"

+erchef['base_resource_url'] = "https://chef.openstreetmap.org"