From 834468e1bd00e87ff5a34ff999a83340b8e75e2c Mon Sep 17 00:00:00 2001 From: adjoly Date: Wed, 5 Mar 2025 19:47:58 +0100 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D=20wip:?= =?UTF-8?q?=20work=20in=20progress,=20not=20done=20yet.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nginx/templates/test.conf.template | 26 +++++++++++++++++++ srcs/docker-compose.yml | 12 ++++----- srcs/docker/mariadb/Dockerfile | 2 +- 3 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 srcs/configs/nginx/templates/test.conf.template diff --git a/srcs/configs/nginx/templates/test.conf.template b/srcs/configs/nginx/templates/test.conf.template new file mode 100644 index 0000000..7e5686e --- /dev/null +++ b/srcs/configs/nginx/templates/test.conf.template @@ -0,0 +1,26 @@ +server { + listen 8443 ssl; + + server_name _; + + root /var/www/wordpress; + index index.php; + + ssl_certificate $NGINX_SSL_CERT_FILE; + ssl_certificate_key $NGINX_SSL_KEY_FILE; + ssl_protocols TLSv1.2 TLSv1.3; + ssl_session_timeout 10m; + + keepalive_timeout 60; + + location / { + try_files $${q}uri $${q}uri/ =404; + } + + location ~ \.php$ { + fastcgi_pass $NGINX_PHP_HOST:9000; + fastcgi_index index.php; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + include fastcgi.conf; + } +} diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index 94f982b..21b0f34 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -65,7 +65,7 @@ services: - ./configs/nginx/entry:/docker-entrypoint.d - nginx-certs:/etc/nginx/ssl ports: - - "443:443" + - "8443:443" restart: unless-stopped wordpress-php: @@ -110,10 +110,10 @@ services: networks: - inception environment: - - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/root-db-pass - - MYSQL_PASSWORD_FILE=/run/secrets/user-db-pass - - MYSQL_USER=${DB_USER} - - MYSQL_DATABASE=${DB_NAME} + - MYSQL_ROOT_PASSWORD=alpine + - MYSQL_PASSWORD=alpine + - MYSQL_USER=kanel + - MYSQL_DATABASE=knl volumes: - wp-db:/var/lib/mysql secrets: @@ -196,7 +196,7 @@ services: volumes: - wp-site:/var/ftp ports: - - 21:21 + - 2100:21 - 30000-30100:30000-30100 secrets: - ftp-pass diff --git a/srcs/docker/mariadb/Dockerfile b/srcs/docker/mariadb/Dockerfile index af3fbfc..e7c3f71 100644 --- a/srcs/docker/mariadb/Dockerfile +++ b/srcs/docker/mariadb/Dockerfile @@ -44,4 +44,4 @@ WORKDIR /var/lib/mysql EXPOSE 3306 CMD [ "mariadbd", "--user=mysql" ] -HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=5s --start-interval=2s CMD /docker-healthcheck +HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=8s --start-interval=2s CMD /docker-healthcheck