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

This is to resolve theforeman/puppet-pulpcore#49
wbclark · Dec 13, 2019 · 70de647 · 70de647
1 parent e713357
commit 70de647
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/manifests/apache.pp b/manifests/apache.pp
@@ -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':
       ensure  => file,
       content => "# This file is managed by puppet, do not alter.\n",
       owner   => 'root',
@@ -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/spec/classes/pulp_apache_spec.rb b/spec/classes/pulp_apache_spec.rb
@@ -23,7 +23,7 @@
     end
 
     it { is_expected.to contain_file('/etc/httpd/conf.d/pulp-vhosts80/')}
-    it { is_expected.to contain_file('/etc/httpd/conf.d/pulp.conf') }
+    it { is_expected.to contain_file('/etc/httpd/conf.d/10-pulp.conf') }
 
     it 'should configure apache server with ssl' do
       is_expected.to contain_apache__vhost('pulp-https').with({

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