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

This is to resolve theforeman/puppet-pulpcore#49
wbclark · Dec 14, 2019 · 3ed8ac4 · 3ed8ac4
1 parent e713357
commit 3ed8ac4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manifests/apache.pp b/manifests/apache.pp
@@ -125,7 +125,7 @@
       notify  => Service['httpd'],
     }
   } else {
-    file {'/etc/httpd/conf.d/pulp.conf':
+    file {'/etc/httpd/conf.d/10-pulp.conf':
       ensure  => file,
       content => template('pulp/pulp.conf.erb'),
       owner   => 'root',

diff --git a/templates/server.conf.erb b/templates/server.conf.erb
@@ -123,7 +123,7 @@ rsa_pub = <%= scope['pulp::rsa_pub'] %>
 #
 # cacert: full path to the CA certificate that will be used to sign consumer
 #     and admin identification certificates; this must match the value of
-#     SSLCACertificateFile in /etc/httpd/conf.d/pulp.conf
+#     SSLCACertificateFile in /etc/httpd/conf.d/10-pulp.conf
 #     Deprecated! - Please note that both cacert and cakey settings will be
 #     removed in the next major release since Pulp will not sign certificates.
 #     However, Pulp will continue to support client certificates generated