Showing with 31 additions and 9 deletions.
  1. +15 −0 CHANGELOG.md
  2. +1 −1 manifests/database.pp
  3. +9 −4 manifests/plugin/container.pp
  4. +4 −4 metadata.json
  5. +2 −0 spec/setup_acceptance_node.pp
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## [10.1.0](https://github.com/theforeman/puppet-pulpcore/tree/10.1.0) (2024-05-16)

[Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/10.0.0...10.1.0)

**Implemented enhancements:**

- Allow puppet/redis 11.x and puppet/systemd 7.x [\#339](https://github.com/theforeman/puppet-pulpcore/pull/339) ([evgeni](https://github.com/evgeni))
- use `migrate --check` not `migrate --plan |grep` check for migrations [\#338](https://github.com/theforeman/puppet-pulpcore/pull/338) ([evgeni](https://github.com/evgeni))
- Allow puppetlabs/apache 12.x [\#334](https://github.com/theforeman/puppet-pulpcore/pull/334) ([evgeni](https://github.com/evgeni))
- Allow setting baseurl fact during acceptance tests [\#333](https://github.com/theforeman/puppet-pulpcore/pull/333) ([Odilhao](https://github.com/Odilhao))

**Fixed bugs:**

- Fixes [\#37308](https://projects.theforeman.org/issues/37308) - set REMOTE\_USER properly for pulpcore registry [\#337](https://github.com/theforeman/puppet-pulpcore/pull/337) ([ianballou](https://github.com/ianballou))

## [10.0.0](https://github.com/theforeman/puppet-pulpcore/tree/10.0.0) (2024-02-19)

[Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/9.0.0...10.0.0)
Expand Down
2 changes: 1 addition & 1 deletion manifests/database.pp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

pulpcore::admin { 'migrate --noinput':
timeout => $timeout,
unless => 'pulpcore-manager migrate --plan | grep "No planned migration operations"',
unless => 'pulpcore-manager migrate --check',
refreshonly => false,
}

Expand Down
13 changes: 9 additions & 4 deletions manifests/plugin/container.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
String $location_prefix = '/pulpcore_registry',
String $registry_version_path = '/v2/',
) {
$api_default_request_headers = [
"unset ${pulpcore::apache::remote_user_environ_header}",
]

$api_additional_request_headers = $pulpcore::api_client_auth_cn_map.map |String $cn, String $pulp_user| {
"set ${pulpcore::apache::remote_user_environ_header} \"${pulp_user}\" \"expr=%{SSL_CLIENT_S_DN_CN} == '${cn}'\""
}

$context = {
'directories' => [
{
Expand All @@ -19,10 +27,7 @@
'url' => "${pulpcore::apache::api_base_url}${registry_version_path}",
},
],
'request_headers' => [
"unset ${pulpcore::apache::remote_user_environ_header}",
"set ${pulpcore::apache::remote_user_environ_header} \"%{SSL_CLIENT_S_DN_CN}s\" env=SSL_CLIENT_S_DN_CN",
],
'request_headers' => $api_default_request_headers + $api_additional_request_headers,
},
],
'proxy_pass' => [
Expand Down
8 changes: 4 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theforeman-pulpcore",
"version": "10.0.0",
"version": "10.1.0",
"author": "theforeman",
"summary": "Installs next generation Pulp server",
"license": "GPL-3.0-or-later",
Expand All @@ -16,19 +16,19 @@
},
{
"name": "puppet/redis",
"version_requirement": ">= 5.0.0 < 11.0.0"
"version_requirement": ">= 5.0.0 < 12.0.0"
},
{
"name": "puppetlabs/apache",
"version_requirement": ">= 5.4.0 < 12.0.0"
"version_requirement": ">= 5.4.0 < 13.0.0"
},
{
"name": "puppetlabs/postgresql",
"version_requirement": ">= 6.5.0 < 11.0.0"
},
{
"name": "puppet/systemd",
"version_requirement": ">= 2.2.0 < 7.0.0"
"version_requirement": ">= 2.2.0 < 8.0.0"
},
{
"name": "puppet/extlib",
Expand Down
2 changes: 2 additions & 0 deletions spec/setup_acceptance_node.pp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
class { 'pulpcore::repo':
version => fact('pulpcore_version'),
baseurl => fact('pulpcore_baseurl'),
gpgkey => fact('pulpcore_gpgkey'),
}

# Needed as a workaround for idempotency
Expand Down