theforeman / puppet-pulp

Puppet module for setting up Pulp 2 as part of Katello installation
GNU General Public License v3.0
16 stars 66 forks source link

Move /etc/httpd/conf.d/{,10-}pulp.conf #385

Closed wbclark closed 4 years ago

wbclark commented 4 years ago

This is to resolve https://github.com/theforeman/puppet-pulpcore/issues/49 by moving pulp.conf to 10-pulp.conf so it loads after the Foreman vhost.

ehelms commented 4 years ago

We still need the changes you have below renaming the file. This one being inside a pure Pulp deployment doesn't need to get renumbered.

On Sat, Dec 14, 2019, 9:19 AM William Bradford Clark < notifications@github.com> wrote:

@wbclark commented on this pull request.

In manifests/apache.pp https://github.com/theforeman/puppet-pulp/pull/385#discussion_r357920180 :

@@ -116,7 +116,7 @@ }

 # This file is installed by pulp-server but we have everything in the above vhost
  • file {'/etc/httpd/conf.d/pulp.conf':
  • file {'/etc/httpd/conf.d/10-pulp.conf':

Will theforeman/puppet-pulpcore#50 https://github.com/theforeman/puppet-pulpcore/pull/50 alone be sufficient?

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/theforeman/puppet-pulp/pull/385?email_source=notifications&email_token=AACHT44OGRD3KE4GET7RCWDQYTTPNA5CNFSM4J2WTGFKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCPGTNBY#discussion_r357920180, or unsubscribe https://github.com/notifications/unsubscribe-auth/AACHT44235TQNWQYUVNHMN3QYTTPNANCNFSM4J2WTGFA .

wbclark commented 4 years ago

I've removed the renaming on line 119

ekohl commented 4 years ago

I still think merging this is incorrect because of https://github.com/theforeman/puppet-pulp/pull/385#discussion_r357853524. You'll just end up with 2 config files now.