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

mount /etc/ssl to enable pickup of infra CA certs

Browse source
This commit is contained in:
Leif Johansson 2017-12-15 11:45:59 +01:00
parent f52eee8371
commit b3bbedc4ca
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,9 +6,10 @@ server.context-path=/eidas-ps
# Service port connector settings # Service port connector settings
server.port=8443 server.port=8443
server.ssl.key-store=classpath:server-tls.jks #server.ssl.key-store=${proxy-service.path.prefix}/keystore/sslSnakeOil.p12
server.ssl.key-store-password=secret #server.ssl.key-store-type=PKCS12
server.ssl.key-password=secret #server.ssl.key-store-password=secret
#server.ssl.key-password=secret
tomcat.ajp.port=8009 tomcat.ajp.port=8009
tomcat.ajp.remoteauthentication=false tomcat.ajp.remoteauthentication=false

2
global/overlay/etc/puppet/cosmos-rules.yaml
View file

@ -46,7 +46,7 @@ r1.komreg.net:
sunet_iaas_cloud: sunet_iaas_cloud:
autoupdate: autoupdate:
eidas_proxy: eidas_proxy:
version: 1.0.3 version: 1.0.4
sunet::frontend::register_sites: sunet::frontend::register_sites:
sites: sites:
'xy.proxy.qa.sveidas.se': 'xy.proxy.qa.sveidas.se':

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

@ -238,7 +238,8 @@ class eidas_proxy($version='1.0.0') {
imagetag => $_version, imagetag => $_version,
ports => ['443:8443'], ports => ['443:8443'],
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'],
env => ["PROXY_SERVICE_PATH_PREFIX=/etc/eidas-proxy/$country", env => ["PROXY_SERVICE_PATH_PREFIX=/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",