Skip to content

Commit

Permalink
Fixes #37761 - use ProxyPass and upgrade=websocket where possible
Browse files Browse the repository at this point in the history
This pick deals with incorrect reverse proxying of cockpit after a
recent CVE fix in Apache.
  • Loading branch information
ekohl committed Sep 18, 2024
1 parent 6d2ed03 commit b03f35c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions Puppetfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit b03f35c

Please sign in to comment.