diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-21 09:03:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-21 09:03:21 +0000 |
| commit | 0b3a67eb4b97517497b4ae258cd541e69c510f02 (patch) | |
| tree | 49847a9606674c056d6af879824fc00ea9cfbeca /docker | |
| parent | 19dc5ef8e287de580ad21d70793391d161078541 (diff) | |
| parent | c12ada91d05521996e44bcbfe392ad45367587af (diff) | |
| download | kolla-0b3a67eb4b97517497b4ae258cd541e69c510f02.tar.gz kolla-0b3a67eb4b97517497b4ae258cd541e69c510f02.zip | |
Merge "CentOS 8: work around mod_ssl certificate issue" into stable/train
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 |