From 52934ca71ee1a8275539a37c4b3dd1e31c0f01f1 Mon Sep 17 00:00:00 2001 From: Dirk Goetz Date: Fri, 23 Feb 2024 14:22:45 +0100 Subject: [PATCH] Fixes #37211 - Add ProxyPass for /images to support avatars Fixes #37211 --- manifests/config/apache.pp | 2 +- spec/classes/foreman_config_apache_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/config/apache.pp b/manifests/config/apache.pp index 59ce4ea6e..56f5059bc 100644 --- a/manifests/config/apache.pp +++ b/manifests/config/apache.pp @@ -99,7 +99,7 @@ Pattern['^(https?|unix)://'] $proxy_backend = 'unix:///run/foreman.sock', Boolean $proxy_add_headers = true, Hash $proxy_params = { 'retry' => '0' }, - Array[String] $proxy_no_proxy_uris = ['/pulp', '/pub', '/icons', '/server-status'], + Array[String] $proxy_no_proxy_uris = ['/pulp', '/pub', '/icons', '/images', '/server-status'], Boolean $proxy_assets = false, Boolean $ssl = false, Optional[Stdlib::Absolutepath] $ssl_ca = undef, diff --git a/spec/classes/foreman_config_apache_spec.rb b/spec/classes/foreman_config_apache_spec.rb index 5b8f73f16..0131b4396 100644 --- a/spec/classes/foreman_config_apache_spec.rb +++ b/spec/classes/foreman_config_apache_spec.rb @@ -63,7 +63,7 @@ 'unset REMOTE_USER_GROUPS' ]) .with_proxy_pass( - "no_proxy_uris" => ['/pulp', '/pub', '/icons', '/server-status', '/webpack', '/assets'], + "no_proxy_uris" => ['/pulp', '/pub', '/icons', '/images', '/server-status', '/webpack', '/assets'], "path" => '/', "url" => 'unix:///run/foreman.sock|http://foreman/', "params" => { "retry" => '0' }, @@ -136,7 +136,7 @@ class { 'apache': it { should contain_apache__vhost('foreman') .with_proxy_pass( - "no_proxy_uris" => ['/pulp', '/pub', '/icons', '/server-status'], + "no_proxy_uris" => ['/pulp', '/pub', '/icons', '/images', '/server-status'], "path" => '/', "url" => 'unix:///run/foreman.sock|http://foreman/', "params" => { "retry" => '0' }, @@ -200,7 +200,7 @@ class { 'apache': ]) .with_ssl_proxyengine(true) .with_proxy_pass( - "no_proxy_uris" => ['/pulp', '/pub', '/icons', '/server-status', '/webpack', '/assets'], + "no_proxy_uris" => ['/pulp', '/pub', '/icons', '/images', '/server-status', '/webpack', '/assets'], "path" => '/', "url" => 'unix:///run/foreman.sock|http://foreman/', "params" => { "retry" => '0' },