diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-25 12:15:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-25 12:15:50 +0000 |
| commit | b46cbad8b61c35ae2887b07932c59099499a06e3 (patch) | |
| tree | 283845f351d6ad0d7caea2c86beca6cd37dfff80 | |
| parent | d7b7f68aea72aa47118a6806375228257b1d1853 (diff) | |
| parent | 003fff5dc1cc94bd8da0fd032e353ddafd0f233a (diff) | |
| download | kolla-b46cbad8b61c35ae2887b07932c59099499a06e3.tar.gz kolla-b46cbad8b61c35ae2887b07932c59099499a06e3.zip | |
Merge "https: remove dhparams.pem before running gencerts" into stable/zed
| -rw-r--r-- | docker/base/httpd_setup.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/base/httpd_setup.sh b/docker/base/httpd_setup.sh index 3dbf84853..5232f4ed1 100644 --- a/docker/base/httpd_setup.sh +++ b/docker/base/httpd_setup.sh @@ -24,7 +24,9 @@ if [[ "$(whoami)" == 'root' ]]; then # on startup: # SSLCertificateFile: file '/etc/pki/tls/certs/localhost.crt' does not exist or is empty # Work around this by generating certificates manually. + # NOTE(mnasiadka): in EL9 upgrade jobs gencerts is failing on wrong permissions to dhparams.pem if [[ "${KOLLA_BASE_DISTRO}" =~ centos|rocky ]] && [[ ! -e /etc/pki/tls/certs/localhost.crt ]]; then + rm -f /tmp/dhparams.pem /usr/libexec/httpd-ssl-gencerts fi fi |