From 549bbed04eb3fbafd2950ec1875e3bbd0a934537 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Tue, 19 Dec 2017 10:47:26 +0100 Subject: [PATCH] switch proxy-service.path.location with proxy-service.path.prefix --- .../overlay/etc/eidas-proxy/xy/cfg/application.properties | 2 ++ global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties b/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties index e0f1b783..e78a0c2d 100644 --- a/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties +++ b/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties @@ -4,6 +4,8 @@ logging.level.org.springframework.web=INFO # Service path server.context-path=/eidas-ps +proxy-service.path.prefix=${proxy-service.path.location}/cfg/ + # Service port connector settings server.port=8443 #server.ssl.key-store=${proxy-service.path.prefix}/keystore/sslSnakeOil.p12 diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 43b831b9..e1d71b7b 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -240,7 +240,7 @@ class eidas_proxy($version='1.0.0') { volumes => ['/var/log/eidas-proxy:/var/log/eidas-proxy', '/etc/eidas-proxy:/etc/eidas-proxy', '/etc/ssl:/etc/ssl'], - env => ["PROXY_SERVICE_PATH_PREFIX=/etc/eidas-proxy/$country", + env => ["PROXY_SERVICE_PATH_LOCATION=/etc/eidas-proxy/$country", "PROXY_SERVICE_DOMAIN_PREFIX=https://$hostname/eidas-ps", "SPRING_PROFILES_ACTIVE=se", "CERTNAME=${::fqdn}_infra",