From 951e5b29564b64e19dc0cc404c44a823855700a8 Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Tue, 11 Apr 2023 23:32:02 +0200
Subject: [PATCH] Update caddy

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
---
 .gitignore                             |  2 +-
 caddy/Caddyfile                        |  3 +++
 Caddyfile => caddy/wordpress/Caddyfile | 18 +-----------------
 docker-compose.yml                     |  3 +--
 4 files changed, 6 insertions(+), 20 deletions(-)
 create mode 100644 caddy/Caddyfile
 rename Caddyfile => caddy/wordpress/Caddyfile (56%)

diff --git a/.gitignore b/.gitignore
index 4c49bd7..03bd412 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-.env
+*.env
diff --git a/caddy/Caddyfile b/caddy/Caddyfile
new file mode 100644
index 0000000..cc92b72
--- /dev/null
+++ b/caddy/Caddyfile
@@ -0,0 +1,3 @@
+#import /path/to/*.caddy
+
+import wordpress/Caddyfile
diff --git a/Caddyfile b/caddy/wordpress/Caddyfile
similarity index 56%
rename from Caddyfile
rename to caddy/wordpress/Caddyfile
index 9c4948b..3a3a132 100644
--- a/Caddyfile
+++ b/caddy/wordpress/Caddyfile
@@ -14,22 +14,6 @@ bensuperpc.org {
     respond /uploads/*.php 404
 }
 
-www.bensuperpc.org {
-    redir https://{host}{uri}
-}
-
-bensuperpc.fr {
-    redir https://{host}{uri}
-}
-
-www.bensuperpc.fr {
-    redir https://{host}{uri}
-}
-
-bensuperpc.com {
-    redir https://{host}{uri}
-}
-
 www.bensuperpc.com {
-    redir https://{host}{uri}
+    redir https://bensuperpc.org{uri}
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 0883b60..a309b5a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,6 @@ services:
     profiles:
       - wordpress
     restart: always
-    user: "root:root"
     env_file:
       - env/wordpress.env
     volumes:
@@ -48,7 +47,7 @@ services:
       - wordpress:/var/www/html:rw
       - caddy_data:/data:rw
       - caddy_config:/config:rw
-      - ./Caddyfile:/etc/caddy/Caddyfile:ro
+      - ./caddy:/etc/caddy:ro
     networks:
       - blog-network
 #  phpmyadmin: