Fixes #28696 - configures apache to serve docker content with pulp3

theforeman · Jan 20, 2020 · 9e81dc3 · 9e81dc3
1 parent 132d38f
commit 9e81dc3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -298,7 +298,11 @@
     include pulpcore::plugin::file
 
     foreman::config::apache::fragment { 'pulpcore-https':
-      ssl_content => template('foreman_proxy_content/pulpcore-api-apache.conf.erb', 'foreman_proxy_content/pulpcore-content-apache.conf.erb'),
+      ssl_content => template(
+        'foreman_proxy_content/pulpcore-api-apache.conf.erb',
+        'foreman_proxy_content/pulpcore-content-apache.conf.erb',
+        'foreman_proxy_content/pulpcore-docker-apache.conf.erb'
+      ),
     }
 
     foreman::config::apache::fragment { 'pulpcore-http':

diff --git a/spec/classes/foreman_proxy_content_spec.rb b/spec/classes/foreman_proxy_content_spec.rb
@@ -63,6 +63,7 @@ class { 'foreman_proxy::plugin::pulp':
           is_expected.to contain_foreman__config__apache__fragment('pulpcore-https')
             .with_ssl_content(%r{ProxyPass /pulp/api/v3 http://127\.0\.0\.1:24817/pulp/api/v3})
             .with_ssl_content(%r{ProxyPass /pulp/content http://127\.0\.0\.1:24816/pulp/content})
+            .with_ssl_content(%r{ProxyPass /pulpcore_registry/v2/ http://127\.0\.0\.1:24816/v2/})
           is_expected.to contain_foreman__config__apache__fragment('pulpcore-http')
             .with_content(%r{ProxyPass /pulp/content http://127\.0\.0\.1:24816/pulp/content})
           is_expected.to contain_foreman__config__apache__fragment('pulpcore-isos')

diff --git a/templates/pulpcore-docker-apache.conf.erb b/templates/pulpcore-docker-apache.conf.erb
@@ -0,0 +1,6 @@
+<Location /pulpcore_registry/v2/>
+  SSLRequire %{SSL_CLIENT_S_DN_CN} eq "admin" 
+</Location>
+
+ProxyPass /pulpcore_registry/v2/ http://127.0.0.1:24816/v2/
+ProxyPassReverse /pulpcore_registry/v2 http://127.0.0.1:24816/v2