summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-05-17 11:53:10 -0700
committerelijah <elijah@riseup.net>2013-05-17 11:53:10 -0700
commitf82d5b5c7004b01565bbeace598d1716f72c1b2f (patch)
tree7bf26fa0de51a592f8da6ef16395afcd6c813e39
parent0f6d2ebd6467d1c793d1907d677ca374a1efe477 (diff)
minor - webapp api port should be integer, not string.
-rw-r--r--provider_base/files/service-definitions/provider.json.erb2
-rw-r--r--provider_base/services/webapp.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb
index bc93fac5..d17aae96 100644
--- a/provider_base/files/service-definitions/provider.json.erb
+++ b/provider_base/files/service-definitions/provider.json.erb
@@ -13,7 +13,7 @@
hsh['services'] = global.services[:service_type => :user_service].field(:name)
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://' + domain.full_suffix + '/ca.crt'
hsh['ca_cert_fingerprint'] = fingerprint(:ca_cert)
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 1fe5cf7b..5f0bdc9e 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -29,7 +29,7 @@
"service_type": "public_service",
"api": {
"domain": "= 'api.' + domain.full_suffix",
- "port": "4430"
+ "port": 4430
},
"dns": {
"aliases": "= [domain.full, api.domain]"