From b03f35c9ad3939e7af1b6473feb9c220be71fd13 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 18 Sep 2024 22:18:44 +0200 Subject: [PATCH] Fixes #37761 - use ProxyPass and upgrade=websocket where possible This pick deals with incorrect reverse proxying of cockpit after a recent CVE fix in Apache. --- Puppetfile | 2 +- Puppetfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Puppetfile b/Puppetfile index ab612cbe..80cca5f2 100644 --- a/Puppetfile +++ b/Puppetfile @@ -10,7 +10,7 @@ mod 'theforeman/puppetserver_foreman', '~> 4.0.0' mod 'theforeman/tftp', '~> 9.1.0' mod 'katello/candlepin', '~> 16.1.0' mod 'theforeman/pulpcore', '~> 10.4.0' -mod 'theforeman/foreman', '~> 25.2.1' +mod 'theforeman/foreman', '~> 25.2.2' mod 'theforeman/foreman_proxy', '~> 26.1.0' mod 'theforeman/puppet', '~> 20.0.0' mod 'katello/foreman_proxy_content', '~> 29.0.1' diff --git a/Puppetfile.lock b/Puppetfile.lock index 02894d1e..edbfb842 100644 --- a/Puppetfile.lock +++ b/Puppetfile.lock @@ -61,7 +61,7 @@ FORGE theforeman-dns (11.0.0) puppetlabs-concat (>= 4.1.0, < 10.0.0) puppetlabs-stdlib (>= 9.0.0, < 10.0.0) - theforeman-foreman (25.2.1) + theforeman-foreman (25.2.2) puppet-extlib (>= 3.0.0, < 8.0.0) puppet-redis (>= 5.0.0, < 12.0.0) puppet-systemd (>= 3.1.0, < 8.0.0) @@ -108,7 +108,7 @@ DEPENDENCIES puppetlabs-vcsrepo (>= 5.2.0) theforeman-dhcp (~> 9.2.0) theforeman-dns (~> 11.0.0) - theforeman-foreman (~> 25.2.1) + theforeman-foreman (~> 25.2.2) theforeman-foreman_proxy (~> 26.1.0) theforeman-pulpcore (~> 10.4.0) theforeman-puppet (~> 20.0.0)