summaryrefslogtreecommitdiff
path: root/provider_base/services/webapp.json
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-04-08 10:41:54 -0700
committerelijah <elijah@riseup.net>2016-04-08 10:41:54 -0700
commit82b15a8a071ba099cf52bb00c66caebdbd265273 (patch)
tree3f27b0673839be7d10ed5b401216ab79e43ce751 /provider_base/services/webapp.json
parent44666c42ce836fb611dfd9c1b549e955c470814c (diff)
parenteac3056c237d523f4786593922fe8f88eb65dff7 (diff)
Merge branch 'feature/mxtest' into develop
Diffstat (limited to 'provider_base/services/webapp.json')
-rw-r--r--provider_base/services/webapp.json10
1 files changed, 8 insertions, 2 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 9e3d751b..b1d2ca59 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -33,7 +33,11 @@
"support"
],
"locales": "= provider.languages",
- "default_locale": "= provider.default_language"
+ "default_locale": "= provider.default_language",
+ "api_tokens": {
+ "monitor": "= secret :api_monitor_auth_token",
+ "allowed_ips": "= host_ips(nodes_like_me)"
+ }
},
"stunnel": {
"clients": {
@@ -55,8 +59,10 @@
"service_type": "public_service",
"api": {
"domain": "= 'api.' + webapp.domain",
+ "version": 1,
"port": 4430,
- "ca_cert_uri": "= 'https://' + webapp.domain + '/ca.crt'"
+ "ca_cert_uri": "= 'https://' + webapp.domain + '/ca.crt'",
+ "uri": "= %(https://#{api.domain}:#{api.port}/#{api.version})"
},
"nickserver": {
"domain": "= 'nicknym.' + domain.full_suffix",