diff options
| author | Zuul <zuul@review.opendev.org> | 2026-09-11 13:48:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-09-11 13:48:44 +0000 |
| commit | 12e3cf2085de6066822a7d77f017d36b0a8e554d (patch) | |
| tree | d4cb74bb69ceed5e9792cbd8b54be055aaae009c /kolla/docker/httpd | |
| parent | d9c5e083132c41fe03af0d256ae883ba1219d1c7 (diff) | |
| parent | f1d7da742d058d893f6abf3c0a21efaf940187b4 (diff) | |
| download | kolla-12e3cf2085de6066822a7d77f017d36b0a8e554d.tar.gz kolla-12e3cf2085de6066822a7d77f017d36b0a8e554d.zip | |
Merge "Drop support for CentOS Stream 10"
Diffstat (limited to 'kolla/docker/httpd')
| -rw-r--r-- | kolla/docker/httpd/httpd_setup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kolla/docker/httpd/httpd_setup.sh b/kolla/docker/httpd/httpd_setup.sh index 35f7b5b1e..5188c5518 100644 --- a/kolla/docker/httpd/httpd_setup.sh +++ b/kolla/docker/httpd/httpd_setup.sh @@ -17,7 +17,7 @@ if [[ "$(whoami)" == 'root' ]]; then rm -rf /var/run/apache2/* else rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* - # NOTE(mmalchuk): This added to make Rocky/Centos similar to Ubuntu/Debian + # NOTE(mmalchuk): This added to make Rocky similar to Ubuntu/Debian # to provide /server-status handler for local monitoring of the Apache. # The module already loaded in the /etc/httpd/conf.modules.d/00-base.conf. cat << EOF >/etc/httpd/conf.modules.d/99-server-status.conf @@ -28,13 +28,13 @@ if [[ "$(whoami)" == 'root' ]]; then EOF fi - # CentOS/Rocky have an issue with mod_ssl which produces an invalid Apache + # Rocky have 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. # 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 + if [[ "${KOLLA_BASE_DISTRO}" =~ rocky ]] && [[ ! -e /etc/pki/tls/certs/localhost.crt ]]; then rm -f /tmp/dhparams.pem /usr/libexec/httpd-ssl-gencerts fi |