Project

General

Profile

« Previous | Next » 

Revision b7953f16

Added by Ewoud Kohl van Wijngaarden about 7 years ago

Ensure /etc/httpd/conf.d/pulp.conf doesn't interfere

The katello-installer already wipes this file1 but if Apache attempts
to start before it's wiped then it will fail to start due to a missing
certificate:

httpd27117: AH00526: Syntax error on line 21 of /etc/httpd/conf.d/pulp.conf:
httpd27117: SSLCACertificateFile: file '/etc/pki/pulp/ca.crt' does not exist or is empty
systemd1: httpd.service: main process exited, code=exited, status=1/FAILURE

[1] https://github.com/Katello/katello-installer/blob/f05e8d737e4a463c16bb3694c61e8c6e13ebd359/hooks/post/29-create_package_httpd_conf.rb

View differences:

manifests/apache.pp
# allow older yum clients to connect, see bz 647828
custom_fragment => 'SSLInsecureRenegotiation On',
}
# This file is installed by pulp-server but we have everything in the above vhost
file {'/etc/httpd/conf.d/pulp.conf':
ensure => file,
content => "# This file is managed by puppet, do not alter.\n",
owner => 'root',
group => 'root',
mode => '0644',
}
} else {
file {'/etc/httpd/conf.d/pulp.conf':
ensure => file,
spec/classes/pulp_apache_spec.rb
end
it { is_expected.to contain_file('/etc/pulp/vhosts80/')}
it { is_expected.to contain_file('/etc/httpd/conf.d/pulp.conf') }
it 'should configure apache server with ssl' do
is_expected.to contain_apache__vhost('pulp-https').with({

Also available in: Unified diff