Обновить setup.sh

setup.sh

@@ -239,19 +239,27 @@ max_execution_time = 300
 max_input_time = 300
 EOF
 
-# Создание паролей для WordPress
+# === Создание .env для WordPress ===
+safe_mkdir "/opt/wordpress"
 cat <<EOF > /opt/wordpress/.env
-# Database
+# =========================
+# Database Configuration
+# =========================
 DB_NAME=wordpressdbname
 DB_USER=wordpressuser
 DB_PASSWORD=$(generate_password 16)
 
-# WordPress
+# =========================
+# WordPress Settings
+# =========================
 WP_DEBUG=false
 WP_DEBUG_LOG=false
 WP_DOMAIN=
 EOF
+chmod 600 /opt/wordpress/.env
+log_success "WordPress .env файл сгенерирован"
 
+# === Создание docker-compose.yml для WordPress ===
 cat <<EOF > /opt/wordpress/docker-compose.yml
 services:
   wordpress:
@@ -261,18 +269,14 @@ services:
     depends_on:
       db:
         condition: service_healthy
+    env_file:
+      - .env
     environment:
-      WORDPRESS_DB_HOST: db
-      WORDPRESS_DB_USER: ${DB_USER}
-      WORDPRESS_DB_PASSWORD: ${DB_PASSWORD}
-      WORDPRESS_DB_NAME: ${DB_NAME}
-      TZ: ${TZ}
-      WP_DOMAIN: ${WP_DOMAIN}
       WORDPRESS_CONFIG_EXTRA: |
-        define('WP_DEBUG', ${WP_DEBUG});
+        define('WP_DEBUG', \${WP_DEBUG});
-        define('WP_DEBUG_LOG', ${WP_DEBUG_LOG});
+        define('WP_DEBUG_LOG', \${WP_DEBUG_LOG});
-        define('WP_HOME', 'https://${WP_DOMAIN}');
+        define('WP_HOME', 'https://\${WP_DOMAIN}');
-        define('WP_SITEURL', 'https://${WP_DOMAIN}');
+        define('WP_SITEURL', 'https://\${WP_DOMAIN}');
         date_default_timezone_set('Asia/Krasnoyarsk');
     volumes:
       # Контент WordPress с хоста
@@ -310,12 +314,11 @@ services:
     container_name: wordpress-db
     image: mysql:8.0
     restart: unless-stopped
+    env_file:
+      - .env
     environment:
-      MYSQL_DATABASE: ${DB_NAME}
-      MYSQL_USER: ${DB_USER}
-      MYSQL_PASSWORD: ${DB_PASSWORD}
       MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
-      TZ: ${TZ}
+      TZ: \${TZ}
     volumes:
       - ./data/mysql:/var/lib/mysql
       - ./config/my.cnf:/etc/mysql/conf.d/custom.cnf:ro
@@ -328,7 +331,7 @@ services:
     networks:
       - wordpress_net
     healthcheck:
-      test: ["CMD-SHELL", "mysqladmin ping -h localhost -u${DB_USER} -p${DB_PASSWORD} || exit 1"]
+      test: ["CMD-SHELL", "mysqladmin ping -h localhost -u\${DB_USER} -p\${DB_PASSWORD} || exit 1"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -343,10 +346,10 @@ services:
         #condition: service_healthy
     #environment:
       #PMA_HOST: db
-      #PMA_USER: ${DB_USER}
+      #PMA_USER: \${DB_USER}
-      #PMA_PASSWORD: ${DB_PASSWORD}
+      #PMA_PASSWORD: \${DB_PASSWORD}
       #PMA_PORT: 3306
-      #TZ: ${TZ}
+      #TZ: \${TZ}
     #networks:
       #- wordpress_net
       #- proxy