swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch proxy-service.path.location with proxy-service.path.prefix

Browse source
This commit is contained in:
Leif Johansson 2017-12-19 10:47:26 +01:00
parent edc2697e09
commit 549bbed04e
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties
View file

@ -4,6 +4,8 @@ logging.level.org.springframework.web=INFO
# Service path # Service path
server.context-path=/eidas-ps server.context-path=/eidas-ps
proxy-service.path.prefix=${proxy-service.path.location}/cfg/
# Service port connector settings # Service port connector settings
server.port=8443 server.port=8443
#server.ssl.key-store=${proxy-service.path.prefix}/keystore/sslSnakeOil.p12 #server.ssl.key-store=${proxy-service.path.prefix}/keystore/sslSnakeOil.p12

2
global/overlay/etc/puppet/manifests/cosmos-site.pp
View file

@ -240,7 +240,7 @@ class eidas_proxy($version='1.0.0') {
volumes => ['/var/log/eidas-proxy:/var/log/eidas-proxy', volumes => ['/var/log/eidas-proxy:/var/log/eidas-proxy',
'/etc/eidas-proxy:/etc/eidas-proxy', '/etc/eidas-proxy:/etc/eidas-proxy',
'/etc/ssl:/etc/ssl'], '/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", "PROXY_SERVICE_DOMAIN_PREFIX=https://$hostname/eidas-ps",
"SPRING_PROFILES_ACTIVE=se", "SPRING_PROFILES_ACTIVE=se",
"CERTNAME=${::fqdn}_infra", "CERTNAME=${::fqdn}_infra",