diff --git a/manifests/plugin/container.pp b/manifests/plugin/container.pp index c1587ae..d9f2874 100644 --- a/manifests/plugin/container.pp +++ b/manifests/plugin/container.pp @@ -2,21 +2,17 @@ # @param location_prefix # In the Apache configuration a location with this prefix is exposed. The # version (currently v2) will be appended. -# @param registry_version_path -# The path beneath the location prefix to forward. This is also appended to -# the content base url. class pulpcore::plugin::container ( String $location_prefix = '/pulpcore_registry', - String $registry_version_path = '/v2/', ) { $context = { 'directories' => [ { 'provider' => 'location', - 'path' => "${location_prefix}${registry_version_path}", + 'path' => $location_prefix, 'proxy_pass' => [ { - 'url' => "${pulpcore::apache::api_base_url}${registry_version_path}", + 'url' => $pulpcore::apache::api_base_url, }, ], 'request_headers' => $pulpcore::apache::api_default_request_headers + $pulpcore::apache::api_additional_request_headers, @@ -31,7 +27,7 @@ } pulpcore::plugin { 'container': - config => 'TOKEN_AUTH_DISABLED=True', + config => "TOKEN_AUTH_DISABLED=True\nFLATPAK_INDEX=True", https_content => epp('pulpcore/apache-fragment.epp', $context), } } diff --git a/spec/classes/plugin_container_spec.rb b/spec/classes/plugin_container_spec.rb index fc30726..6bab2a4 100644 --- a/spec/classes/plugin_container_spec.rb +++ b/spec/classes/plugin_container_spec.rb @@ -13,7 +13,8 @@ .that_subscribes_to('Class[Pulpcore::Install]') .that_notifies(['Class[Pulpcore::Database]', 'Class[Pulpcore::Service]']) is_expected.to contain_package('pulpcore-plugin(container)') - is_expected.to contain_concat__fragment('plugin-container').with_content("\n# container plugin settings\nTOKEN_AUTH_DISABLED=True") + is_expected.to contain_concat__fragment('plugin-container') + .with_content("\n# container plugin settings\nTOKEN_AUTH_DISABLED=True\nFLATPAK_INDEX=True") is_expected.to contain_pulpcore__apache__fragment('plugin-container') is_expected.not_to contain_apache__vhost__fragment('pulpcore-http-plugin-container') is_expected.to contain_apache__vhost__fragment('pulpcore-https-plugin-container') @@ -21,11 +22,11 @@ .with_priority('10') .with_content(< + RequestHeader unset REMOTE-USER RequestHeader unset REMOTE_USER - ProxyPass unix:///run/pulpcore-api.sock|http://pulpcore-api/v2/ - ProxyPassReverse unix:///run/pulpcore-api.sock|http://pulpcore-api/v2/ + ProxyPass unix:///run/pulpcore-api.sock|http://pulpcore-api + ProxyPassReverse unix:///run/pulpcore-api.sock|http://pulpcore-api ProxyPass /pulp/container/ unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/container/ @@ -49,12 +50,12 @@ class {'pulpcore': .with_priority('10') .with_content(< + RequestHeader unset REMOTE-USER RequestHeader unset REMOTE_USER RequestHeader set REMOTE-USER "admin" "expr=%{SSL_CLIENT_S_DN_CN} == 'foreman.example.com'" - ProxyPass unix:///run/pulpcore-api.sock|http://pulpcore-api/v2/ - ProxyPassReverse unix:///run/pulpcore-api.sock|http://pulpcore-api/v2/ + ProxyPass unix:///run/pulpcore-api.sock|http://pulpcore-api + ProxyPassReverse unix:///run/pulpcore-api.sock|http://pulpcore-api ProxyPass /pulp/container/ unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/container/