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