From 882f23f734c3a9181b5c6b06cbc3112adbda361c Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 6 Dec 2017 22:55:22 +0100 Subject: [PATCH] prid service config --- global/overlay/etc/puppet/cosmos-rules.yaml | 6 ++++++ .../etc/puppet/manifests/cosmos-site.pp | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 58b41b38..0c4773d8 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -51,3 +51,9 @@ r1.komreg.net: - 'se-fre-lb-1.sunet.se' - 'se-tug-lb-1.sunet.se' port: '443' + +'^prid-[0-9]+\.qa\.sveidas\.se$': + openstack_ubuntu_16_04_dockerhost: + konsulter: + sunet_iaas_cloud: + autoupdate: diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 8778ad66..6c75a39c 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -257,7 +257,23 @@ class eidas_proxy { "SPRING_PROFILES_ACTIVE=se", "SPRING_CONFIG_LOCATION=/etc/eidas-proxy/$country/cfg/", "PROXY_SERVICE_COOKIEENCRYPTPW=$proxy_service_cookie_encrypt_pw"] - } + } -> + class {'webserver': } -> + class {'https_server': } +} + +class prid($hostname) { + sunet::docker_run {'eidas_proxy': + image => 'docker.sunet.se/prid-service', + imagetag => '1.0.0', + hostname => "$hostname", + ports => ['443:8443'] + volumes => ['/var/log/prid-service:/var/log/prid-service', + '/etc/prid-service:/etc/prid-service', + '/etc/ssl:/etc/ssl'], + env => ["PRID_SERVICE_POLICY_CONFIGURATION=/etc/prid-service/policy.properties", + "CERTNAME=${hostname}_infra"] + } -> class {'webserver': } -> class {'https_server': } }