From 8bdbc09a7ff479713866e30fd6edc3b0e3985b0e Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 26 Jun 2025 17:10:38 +0900 Subject: [PATCH] Removed redundant code --- .../web-apache-pgsql/ol/docker-entrypoint.sh | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh index add12fe57..83452cdd2 100755 --- a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh @@ -140,28 +140,6 @@ check_db_connect() { unset PGSSLKEY } -prepare_web_server() { - APACHE_SITES_DIR=/etc/httpd/conf.d - - echo "** Adding Zabbix virtual host (HTTP)" - if [ -f "$ZABBIX_CONF_DIR/apache.conf" ]; then - ln -sfT "$ZABBIX_CONF_DIR/apache.conf" "$APACHE_SITES_DIR/zabbix.conf" - else - echo "**** Impossible to enable HTTP virtual host" - fi - - if [ -f "/etc/ssl/apache2/ssl.crt" ] && [ -f "/etc/ssl/apache2/ssl.key" ]; then - echo "** Adding Zabbix virtual host (HTTPS)" - if [ -f "$ZABBIX_CONF_DIR/apache_ssl.conf" ]; then - ln -sfT "$ZABBIX_CONF_DIR/apache_ssl.conf" "$APACHE_SITES_DIR/zabbix_ssl.conf" - else - echo "**** Impossible to enable HTTPS virtual host" - fi - else - echo "**** Impossible to enable SSL support for Apache2. Certificates are missed." - fi -} - prepare_web_server() { if [ "$(id -u)" == '0' ]; then export APACHE_RUN_USER=${DAEMON_USER}