diff options
| author | varac <varacanero@zeromail.org> | 2013-04-26 12:30:46 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-04-26 12:30:46 +0200 |
| commit | 334e4242a55f36c8ba3bbaa8b5e1c44664402450 (patch) | |
| tree | 80c0b8734b434c654eab7c86c89d009f11535c87 | |
| parent | 1c61472a0c0c14351993574f2673a6a3a3c75371 (diff) | |
| parent | 27cb083212a74c94ed069ce9ef3dfc7593e85524 (diff) | |
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop
| -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.json | 5 | ||||
| m--------- | puppet/modules/apache | 0 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 7 |
4 files changed, 9 insertions, 3 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": { diff --git a/puppet/modules/apache b/puppet/modules/apache -Subproject 688f07793a72ba4453f6663b6d19fe6388ba382 +Subproject 090e59ad1fcba01e868237a83cadf9254cf09d3 diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index 636a156d..8b5bb0e3 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -6,6 +6,7 @@ class site_webapp { $node_domain = hiera('domain') $provider_domain = $node_domain['full_suffix'] $webapp = hiera('webapp') + $api_version = $webapp['api_version'] $secret_token = $webapp['secret_token'] Class[Ruby] -> Class[rubygems] -> Class[bundler::install] @@ -83,7 +84,11 @@ class site_webapp { ensure => directory, owner => leap-webapp, group => leap-webapp, mode => '0755'; - '/srv/leap-webapp/public/config/eip-service.json': + "/srv/leap-webapp/public/config/${api_version}": + ensure => directory, + owner => leap-webapp, group => leap-webapp, mode => '0755'; + + "/srv/leap-webapp/public/config/${api_version}/eip-service.json": content => $eip_service, owner => leap-webapp, group => leap-webapp, mode => '0644'; } |