diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-03 14:35:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-03 14:35:22 +0000 |
| commit | 5dbe87912c06a0db5108c67cbb7f127a57860598 (patch) | |
| tree | dd563689e44b4bc97ad6b81fa3058f66dbcec850 /docker | |
| parent | 34f748a8be5c1ba870dcd252e0e8fa3351fe7700 (diff) | |
| parent | 3590188383d8590a1e91573da656776563f65fcb (diff) | |
| download | kolla-5dbe87912c06a0db5108c67cbb7f127a57860598.tar.gz kolla-5dbe87912c06a0db5108c67cbb7f127a57860598.zip | |
Merge "CentOS 8: work around mod_ssl certificate issue"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/httpd_setup.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/base/httpd_setup.sh b/docker/base/httpd_setup.sh index 990062e6d..edb1d7df6 100644 --- a/docker/base/httpd_setup.sh +++ b/docker/base/httpd_setup.sh @@ -15,4 +15,13 @@ if [[ "$(whoami)" == 'root' ]]; then else rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* fi + + # CentOS 8 has an issue with mod_ssl which produces an invalid Apache + # configuration in /etc/httpd/conf.d/ssl.conf. This causes the following error + # on startup: + # SSLCertificateFile: file '/etc/pki/tls/certs/localhost.crt' does not exist or is empty + # Work around this by generating certificates manually. + if [[ ${KOLLA_BASE_DISTRO} = centos ]] && [[ ! -e /etc/pki/tls/certs/localhost.crt ]]; then + /usr/libexec/httpd-ssl-gencerts + fi fi |