From 9e9ef9281b58c09b158db52f5a502ced71ab96e2 Mon Sep 17 00:00:00 2001 From: hosh1 Date: Tue, 12 Aug 2025 11:30:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=B2=20=D1=84=D1=83=D0=BD=D0=BA?= =?UTF-8?q?=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/install.sh b/install.sh index 2a3b024..6ba4f61 100644 --- a/install.sh +++ b/install.sh @@ -45,44 +45,21 @@ cleanup_apache_config() { log_info "Очистка конфигурации Apache от дубликатов..." if [ "$DISTRO_FAMILY" = "debian" ]; then - # Удаляем дублирующиеся записи Listen из ports.conf if [ -f /etc/apache2/ports.conf ]; then - # Создаем резервную копию cp /etc/apache2/ports.conf /etc/apache2/ports.conf.backup.$(date +%Y%m%d_%H%M%S) - # Удаляем дубликаты Listen :80 и оставляем только один Listen *:80 - awk ' - /^Listen.*:80$/ { - if (!seen) { - seen = 1 - print "Listen *:80" - } - next - } - { print } - ' /etc/apache2/ports.conf > /etc/apache2/ports.conf.tmp - + grep -v "^Listen.*:80" /etc/apache2/ports.conf > /etc/apache2/ports.conf.tmp || true + echo "Listen *:80" >> /etc/apache2/ports.conf.tmp mv /etc/apache2/ports.conf.tmp /etc/apache2/ports.conf fi elif [ "$DISTRO_FAMILY" = "rhel" ]; then HTTPD_CONF="/etc/httpd/conf/httpd.conf" if [ -f "$HTTPD_CONF" ]; then - # Создаем резервную копию cp "$HTTPD_CONF" "${HTTPD_CONF}.backup.$(date +%Y%m%d_%H%M%S)" - # Удаляем дубликаты Listen :80 и оставляем только один Listen *:80 - awk ' - /^Listen.*:80$/ { - if (!seen) { - seen = 1 - print "Listen *:80" - } - next - } - { print } - ' "$HTTPD_CONF" > "${HTTPD_CONF}.tmp" - + grep -v "^Listen.*:80" "$HTTPD_CONF" > "${HTTPD_CONF}.tmp" || true + echo "Listen *:80" >> "${HTTPD_CONF}.tmp" mv "${HTTPD_CONF}.tmp" "$HTTPD_CONF" fi fi