From e6f6324ebea9fc46d5d617a08c2eb239349d9f90 Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 7 Aug 2015 18:08:14 -0700 Subject: move 'enabled service' calculation to a macro. --- provider_base/files/service-definitions/provider.json.erb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'provider_base/files/service-definitions') diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb index be8ae484..e51f9c3a 100644 --- a/provider_base/files/service-definitions/provider.json.erb +++ b/provider_base/files/service-definitions/provider.json.erb @@ -6,11 +6,6 @@ ) hsh['domain'] = domain.full_suffix - # advertise services that are 'user services' and for which there are actually nodes - hsh['services'] ||= global.services[:service_type => :user_service].field(:name).select do |service| - nodes_like_me[:services => service].any? - end - hsh['api_version'] = "1" hsh['api_uri'] = ["https://", api.domain, ':', api.port].join -- cgit v1.2.3 From 3f1c9f42cd93f6ef099124b33663fd9f288eb430 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 19 Aug 2015 17:41:45 -0700 Subject: allow ca_cert_uri to be configured --- provider_base/files/service-definitions/provider.json.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'provider_base/files/service-definitions') diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb index e51f9c3a..a75bea61 100644 --- a/provider_base/files/service-definitions/provider.json.erb +++ b/provider_base/files/service-definitions/provider.json.erb @@ -9,7 +9,7 @@ hsh['api_version'] = "1" hsh['api_uri'] = ["https://", api.domain, ':', api.port].join - hsh['ca_cert_uri'] = 'https://' + webapp.domain + '/ca.crt' + hsh['ca_cert_uri'] = api.ca_cert_uri hsh['ca_cert_fingerprint'] = fingerprint(:ca_cert) hsh.dump_json -- cgit v1.2.3