From 1e101d300fe914736c157cd04f6a5f38e2bfbb72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= Date: Wed, 11 Dec 2024 15:18:32 +0100 Subject: [PATCH] Add posibility to add extra proxy config in config file. --- global/overlay/etc/puppet/modules/soc/manifests/sso.pp | 1 + .../etc/puppet/modules/soc/templates/sso/apache-site.conf.erb | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/global/overlay/etc/puppet/modules/soc/manifests/sso.pp b/global/overlay/etc/puppet/modules/soc/manifests/sso.pp index 5db0f9f..9b4284d 100644 --- a/global/overlay/etc/puppet/modules/soc/manifests/sso.pp +++ b/global/overlay/etc/puppet/modules/soc/manifests/sso.pp @@ -44,6 +44,7 @@ class soc::sso( String $translog = 'INFO', String $proxy = 'https://shared-sso-proxy1.cert.sunet.se/idp', String $entityID = $proxy, + Optional[String] $extra_proxy_conf = undef, ) { if $ssotype == "docker" { diff --git a/global/overlay/etc/puppet/modules/soc/templates/sso/apache-site.conf.erb b/global/overlay/etc/puppet/modules/soc/templates/sso/apache-site.conf.erb index 538db71..67b385f 100644 --- a/global/overlay/etc/puppet/modules/soc/templates/sso/apache-site.conf.erb +++ b/global/overlay/etc/puppet/modules/soc/templates/sso/apache-site.conf.erb @@ -39,6 +39,10 @@ ShibUseHeaders On <%- end -%> + <%- if @extra_proxy_conf -%> + IncludeOptional <%= @extra_proxy_conf %> + <%- endif -%> + AuthGroupFile /etc/apache2/groups.txt Require group <% @groups.each.with_index do |group, i| %><%= group %><%= ' ' if i < (@groups.size - 1) %><% end %>