Skip to content

Add Apache proxy for flatpak index #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ehelms merged 1 commit into from
Jul 2, 2025
+12 −0
Merged

Add Apache proxy for flatpak index #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions manifests/container.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
# @param registry_v2_path
# The path beneath the location prefix to forward. This is also appended to
# the content base url.
# @param flatpak_index_path
# The path where the flatpak index resides
# @param pulpcore_https_vhost
# The name of the Apache https vhost for Pulpcore
# @param cname
Expand All @@ -16,6 +18,7 @@
String $location_prefix = '/pulpcore_registry',
String $registry_v1_path = '/v1/',
String $registry_v2_path = '/v2/',
String $flatpak_index_path = '/index/',
String $pulpcore_https_vhost = 'pulpcore-https',
Stdlib::Fqdn $cname = $facts['networking']['fqdn'],
) {
Expand All @@ -37,6 +40,10 @@
'path' => $registry_v2_path,
'url' => "${foreman_proxy::real_registered_proxy_url}/container_gateway${registry_v2_path}",
},
{
'path' => $flatpak_index_path,
'url' => "${foreman_proxy::real_registered_proxy_url}/container_gateway${flatpak_index_path}",
},
],
}

Expand Down
5 changes: 5 additions & 0 deletions spec/classes/foreman_proxy_content__container_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
.with_content(%r{^\s+</Location>$})
.with_content(%r{^\s+ProxyPass /v1/ https://foo\.example\.com:8443/container_gateway/v1/$})
.with_content(%r{^\s+ProxyPass /v2/ https://foo\.example\.com:8443/container_gateway/v2/$})
.with_content(%r{^\s+ProxyPass /index/ https://foo\.example\.com:8443/container_gateway/index/$})
.with_content(%r{^\s+ProxyPassReverse /v1/ https://foo\.example\.com:8443/container_gateway/v1/$})
.with_content(%r{^\s+ProxyPassReverse /v2/ https://foo\.example\.com:8443/container_gateway/v2/$})
.with_content(%r{^\s+ProxyPassReverse /index/ https://foo\.example\.com:8443/container_gateway/index/$})
end
end

Expand All @@ -34,6 +36,7 @@
location_prefix: '/other_pulpcore_registry',
registry_v1_path: '/vr1/',
registry_v2_path: '/vr2/',
flatpak_index_path: '/index/',
pulpcore_https_vhost: 'rhsm-pulpcore-reverse-proxy-443',
cname: 'anoTHeR.example.COM',
}
Expand All @@ -50,8 +53,10 @@
.with_content(%r{^\s+</Location>$})
.with_content(%r{^\s+ProxyPass /vr1/ https://foo\.example\.com:8443/container_gateway/vr1/$})
.with_content(%r{^\s+ProxyPass /vr2/ https://foo\.example\.com:8443/container_gateway/vr2/$})
.with_content(%r{^\s+ProxyPass /index/ https://foo\.example\.com:8443/container_gateway/index/$})
.with_content(%r{^\s+ProxyPassReverse /vr1/ https://foo\.example\.com:8443/container_gateway/vr1/$})
.with_content(%r{^\s+ProxyPassReverse /vr2/ https://foo\.example\.com:8443/container_gateway/vr2/$})
.with_content(%r{^\s+ProxyPassReverse /index/ https://foo\.example\.com:8443/container_gateway/index/$})
end
end
end
Expand Down