diff --git a/manifests/container.pp b/manifests/container.pp index c8f46d0..60eb4d7 100644 --- a/manifests/container.pp +++ b/manifests/container.pp @@ -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 @@ -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'], ) { @@ -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}", + }, ], } diff --git a/spec/classes/foreman_proxy_content__container_spec.rb b/spec/classes/foreman_proxy_content__container_spec.rb index afc585c..1c201e3 100644 --- a/spec/classes/foreman_proxy_content__container_spec.rb +++ b/spec/classes/foreman_proxy_content__container_spec.rb @@ -23,8 +23,10 @@ .with_content(%r{^\s+$}) .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 @@ -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', } @@ -50,8 +53,10 @@ .with_content(%r{^\s+$}) .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