From 215883d881a2d591b15d41a94bc4c0a7ea7b57b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= Date: Wed, 20 Nov 2024 13:17:13 +0100 Subject: [PATCH] Don't add docker network if it exists --- global/overlay/etc/puppet/modules/soc/manifests/sso.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/global/overlay/etc/puppet/modules/soc/manifests/sso.pp b/global/overlay/etc/puppet/modules/soc/manifests/sso.pp index 1b01367..3001db2 100644 --- a/global/overlay/etc/puppet/modules/soc/manifests/sso.pp +++ b/global/overlay/etc/puppet/modules/soc/manifests/sso.pp @@ -43,10 +43,10 @@ class soc::sso( Boolean $satosa_certbot = false, String $translog = 'INFO', String $proxy = 'https://shared-sso-proxy1.cert.sunet.se/idp', - Strnng $entityID = $proxy, + String $entityID = $proxy, ) { - if $ssotype == "docker" { + if $ssotype == "docker" { file { '/opt/sso': ensure => directory, } @@ -189,6 +189,7 @@ class soc::sso( # specify this subnet as source of trusted proxies. This is used in Graylog, # for example; see setting "trusted_proxies". command => 'docker network create sso --subnet 172.29.0.0/24 || true' + unless => 'docker network ls | grep -q sso 2>&1' } file { '/opt/sso/docker-compose.yml':