summaryrefslogtreecommitdiff
path: root/provider_base/files/service-definitions/provider.json.erb
diff options
context:
space:
mode:
Diffstat (limited to 'provider_base/files/service-definitions/provider.json.erb')
-rw-r--r--provider_base/files/service-definitions/provider.json.erb17
1 files changed, 9 insertions, 8 deletions
diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb
index f26f25a2..5d4c63a0 100644
--- a/provider_base/files/service-definitions/provider.json.erb
+++ b/provider_base/files/service-definitions/provider.json.erb
@@ -1,20 +1,21 @@
<%=
- hsh = {}
-
# grab some fields from provider.json
hsh = global.provider.pick(
:languages, :description, :name,
- :enrollment_policy, :default_language, :domain
+ :enrollment_policy, :default_language, :service
)
+ hsh['domain'] = domain.full_suffix
- # advertise services that are 'user services'
- hsh['services'] = global.services[:service_type => :user_service].field(:name)
+ # 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
+ hsh['api_uri'] = ["https://", api.domain, ':', api.port].join
- hsh['ca_cert_uri'] = 'https://' + global.provider.domain + '/ca.crt'
+ hsh['ca_cert_uri'] = 'https://' + domain.full_suffix + '/ca.crt'
hsh['ca_cert_fingerprint'] = fingerprint(:ca_cert)
- generate_json hsh
+ hsh.dump_json
%> \ No newline at end of file