From 28d99aad8db507bff8f0f9ad49aa857518002252 Mon Sep 17 00:00:00 2001 From: hosh1 Date: Tue, 12 Aug 2025 11:38:43 +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=B5=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3?= =?UTF-8?q?=D0=B0=20Apache?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/install.sh b/install.sh index 6ba4f61..09ef104 100644 --- a/install.sh +++ b/install.sh @@ -48,7 +48,7 @@ cleanup_apache_config() { if [ -f /etc/apache2/ports.conf ]; then cp /etc/apache2/ports.conf /etc/apache2/ports.conf.backup.$(date +%Y%m%d_%H%M%S) - grep -v "^Listen.*:80" /etc/apache2/ports.conf > /etc/apache2/ports.conf.tmp || true + grep -v "^Listen\s\+.*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 @@ -749,26 +749,26 @@ EOF log_success "Конфигурация виртуального хоста создана" cleanup_apache_config - log_step "Настройка Apache для прослушивания всех интерфейсов..." - if [ "$DISTRO_FAMILY" = "debian" ]; then - if ! grep -q "Listen.*:80" /etc/apache2/ports.conf; then - echo "Listen *:80" >> /etc/apache2/ports.conf - elif grep -q "Listen 127.0.0.1:80" /etc/apache2/ports.conf && ! grep -q "Listen \*:80\|Listen 0.0.0.0:80" /etc/apache2/ports.conf; then - sed -i 's/Listen 127.0.0.1:80/Listen *:80/' /etc/apache2/ports.conf - fi - awk '!seen && /^Listen.*:80$/{seen=1; print "Listen *:80"; next} !/^Listen.*:80$/{print}' /etc/apache2/ports.conf > /etc/apache2/ports.conf.tmp && mv /etc/apache2/ports.conf.tmp /etc/apache2/ports.conf + # log_step "Настройка Apache для прослушивания всех интерфейсов..." + # if [ "$DISTRO_FAMILY" = "debian" ]; then + # if ! grep -q "Listen.*:80" /etc/apache2/ports.conf; then + # echo "Listen *:80" >> /etc/apache2/ports.conf + # elif grep -q "Listen 127.0.0.1:80" /etc/apache2/ports.conf && ! grep -q "Listen \*:80\|Listen 0.0.0.0:80" /etc/apache2/ports.conf; then + # sed -i 's/Listen 127.0.0.1:80/Listen *:80/' /etc/apache2/ports.conf + # fi + # awk '!seen && /^Listen.*:80$/{seen=1; print "Listen *:80"; next} !/^Listen.*:80$/{print}' /etc/apache2/ports.conf > /etc/apache2/ports.conf.tmp && mv /etc/apache2/ports.conf.tmp /etc/apache2/ports.conf - elif [ "$DISTRO_FAMILY" = "rhel" ]; then - HTTPD_CONF="/etc/httpd/conf/httpd.conf" + # elif [ "$DISTRO_FAMILY" = "rhel" ]; then + # HTTPD_CONF="/etc/httpd/conf/httpd.conf" - if ! grep -q "Listen.*:80" "$HTTPD_CONF"; then - echo "Listen *:80" >> "$HTTPD_CONF" - elif grep -q "Listen 127.0.0.1:80" "$HTTPD_CONF" && ! grep -q "Listen \*:80\|Listen 0.0.0.0:80" "$HTTPD_CONF"; then - sed -i 's/Listen 127.0.0.1:80/Listen *:80/' "$HTTPD_CONF" - fi - awk '!seen && /^Listen.*:80$/{seen=1; print "Listen *:80"; next} !/^Listen.*:80$/{print}' "$HTTPD_CONF" > "$HTTPD_CONF.tmp" && mv "$HTTPD_CONF.tmp" "$HTTPD_CONF" - fi - log_success "Apache настроен для прослушивания всех интерфейсов" + # if ! grep -q "Listen.*:80" "$HTTPD_CONF"; then + # echo "Listen *:80" >> "$HTTPD_CONF" + # elif grep -q "Listen 127.0.0.1:80" "$HTTPD_CONF" && ! grep -q "Listen \*:80\|Listen 0.0.0.0:80" "$HTTPD_CONF"; then + # sed -i 's/Listen 127.0.0.1:80/Listen *:80/' "$HTTPD_CONF" + # fi + # awk '!seen && /^Listen.*:80$/{seen=1; print "Listen *:80"; next} !/^Listen.*:80$/{print}' "$HTTPD_CONF" > "$HTTPD_CONF.tmp" && mv "$HTTPD_CONF.tmp" "$HTTPD_CONF" + # fi + # log_success "Apache настроен для прослушивания всех интерфейсов" log_step "Настройка PHP.ini..." if [ "$DISTRO_FAMILY" = "debian" ]; then