diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-04-24 19:25:00 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-05-06 07:00:42 +0000 |
| commit | 610eef2089c186c6e698bb1781501ee8c696f7d5 (patch) | |
| tree | 9adad05e1544ef7dceaf056bd5dbb97c39765952 /docker/base/httpd_setup.sh | |
| parent | 33c0e26e8a0290f0b6d647bb67e18a4f500907fc (diff) | |
| download | kolla-610eef2089c186c6e698bb1781501ee8c696f7d5.tar.gz kolla-610eef2089c186c6e698bb1781501ee8c696f7d5.zip | |
Drop apache installation outside of httpd container22.0.0.0rc1
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/986483
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/986352
Change-Id: Ia66dde09bbbad2a5a9e67a8c642f3223ca38be43
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/base/httpd_setup.sh')
| -rw-r--r-- | docker/base/httpd_setup.sh | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/docker/base/httpd_setup.sh b/docker/base/httpd_setup.sh deleted file mode 100644 index 35f7b5b1e..000000000 --- a/docker/base/httpd_setup.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -# This script performs setup necessary to run the Apache httpd web server. -# It should be sourced rather than executed as environment variables are set. - -# Assume the service runs on top of Apache httpd when user is root. -if [[ "$(whoami)" == 'root' ]]; then - # NOTE(pbourke): httpd will not clean up after itself in some cases which - # results in the container not being able to restart. (bug #1489676, 1557036) - if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then - # NOTE(yoctozepto): APACHE_CONFDIR has to be set to pass the next step - # under the `set -o nounset` regime - APACHE_CONFDIR= - # Loading Apache2 ENV variables - . /etc/apache2/envvars - install -d /var/run/apache2/ - 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 - # 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 -<Location "/server-status"> - SetHandler server-status - Require local -</Location> -EOF - fi - - # CentOS/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 - rm -f /tmp/dhparams.pem - /usr/libexec/httpd-ssl-gencerts - fi -fi - -# The default system locale with unicode support -LANG=C.UTF-8 - -# Override the default locale if configured -if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then - [ -f /etc/default/locale ] && . /etc/default/locale -else - [ -f /etc/locale.conf ] && . /etc/locale.conf -fi |