summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-04-26 12:30:46 +0200
committervarac <varacanero@zeromail.org>2013-04-26 12:30:46 +0200
commit334e4242a55f36c8ba3bbaa8b5e1c44664402450 (patch)
tree80c0b8734b434c654eab7c86c89d009f11535c87 /provider_base
parent1c61472a0c0c14351993574f2673a6a3a3c75371 (diff)
parent27cb083212a74c94ed069ce9ef3dfc7593e85524 (diff)
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/files/service-definitions/v1/eip-service.json.erb (renamed from provider_base/files/service-definitions/eip-service.json.erb)0
-rw-r--r--provider_base/services/webapp.json5
2 files changed, 3 insertions, 2 deletions
diff --git a/provider_base/files/service-definitions/eip-service.json.erb b/provider_base/files/service-definitions/v1/eip-service.json.erb
index ca42bef5..ca42bef5 100644
--- a/provider_base/files/service-definitions/eip-service.json.erb
+++ b/provider_base/files/service-definitions/v1/eip-service.json.erb
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index f87b0833..e4926ba7 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -11,7 +11,8 @@
"allow_limited_certs": "= global.provider.service.allow_limited_bandwidth",
"allow_unlimited_certs": "= global.provider.service.allow_unlimited_bandwidth",
"allow_anonymous_certs": "= global.provider.service.allow_anonymous",
- "secret_token": "= secret :webapp_secret_token"
+ "secret_token": "= secret :webapp_secret_token",
+ "api_version": 1
},
"stunnel": {
"couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)"
@@ -21,7 +22,7 @@
},
"definition_files": {
"provider": "= file :provider_json_template",
- "eip_service": "= file :eip_service_json_template"
+ "eip_service": "= file [:eip_service_json_template, 'v'+webapp.api_version.to_s]"
},
"service_type": "public_service",
"api": {