From 07925f6b17dc2bb00ec7957200ea009cb46b2c76 Mon Sep 17 00:00:00 2001
From: zino <marlon.maschkiwitz@4players.io>
Date: Mon, 27 Nov 2023 14:53:07 +0100
Subject: [PATCH] modified

---
 docker-compose.yml |  2 +-
 vhost.conf         | 28 +++++++++++-----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bd91580..ed53e9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
   4netplayers-wordpress-mariadb:
     image: mariadb:latest
     container_name: 4netplayers-wordpress-mariadb
-    restart: always
+    restart: on-failure
     environment:
       MYSQL_DATABASE: wp
       MYSQL_USER: zino
diff --git a/vhost.conf b/vhost.conf
index 76ef7ee..e97fa59 100644
--- a/vhost.conf
+++ b/vhost.conf
@@ -1,16 +1,14 @@
 server {
-    root /home/zino/projects/dockers/4netplayers-wordpress/volumes/wordpress;
+    root /usr/share/nginx/html/4netplayers.zinomedia.de;
     server_name 4netplayers.zinomedia.de;
     index index.php;
 
     client_max_body_size 32m;
 
-    listen [::]:443 ssl; # managed by Certbot
-    listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/4netplayers.zinomedia.de/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/4netplayers.zinomedia.de/privkey.pem; # managed by Certbot
-    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+    listen [::]:443 ssl;
+    listen 443 ssl;
+    ssl_certificate /etc/letsencrypt/live/4netplayers.zinomedia.de/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/4netplayers.zinomedia.de/privkey.pem;
 
     location ~ /(\.user\.ini|debug\.log) {
         deny all;
@@ -24,7 +22,7 @@ server {
         proxy_set_header X-Forwarded-Host $host:$server_port;
         proxy_set_header X-Forwarded-Server $host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_pass http://127.0.0.1:8095;
+        proxy_pass http://4netplayers-wordpress:80;
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 
@@ -52,12 +50,8 @@ server {
 }
 
 server {
-    if ($host = 4netplayers.zinomedia.de) {
-        return 301 https://$host$request_uri;
-        } # managed by Certbot
-
-        listen 80 default_server;
-        listen [::]:80 default_server;
-        server_name 4netplayers.zinomedia.de;
-        return 404; # managed by Certbot
-    }
\ No newline at end of file
+    server_name 4netplayers.zinomedia.de;
+    listen 80;
+    listen [::]:80;
+    return 301 https://$host$request_uri;
+}
\ No newline at end of file