From 2aaccc2458be31693341b2a75e7e45ef65a03bc2 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Sun, 25 Aug 2024 20:53:35 +0200 Subject: [PATCH] Move wordpress domain Signed-off-by: Bensuperpc --- README.md | 8 ++++---- .../caddy/config/bensuperpc.org/Caddyfile | 20 +++++++++++-------- infrastructure/homepage/config/services.yaml | 4 ++-- infrastructure/yacht/env/yacht.env | 1 + 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 690f44e..c3f1b9f 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,8 @@ And then, caddy will generate the certificate for you and renew it automatically | Domain name | Type | Description | | --- | --- | --- | -| [homepage.bensuperpc.org](https://homepage.bensuperpc.org) | Sub | Homepage | -| [bensuperpc.org](https://bensuperpc.org) | Main | Main domain | +| [www.bensuperpc.org](https://www.bensuperpc.org) | Main | Homepage | +| [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org) | Sub | Wordpress website | | [adminer.bensuperpc.org](https://adminer.bensuperpc.org) | Sub | Adminer for MariaDB for wordpress only | | [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) | Sub | Uptime Kuma for monitoring | | [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | Sub | Torrent client/server | @@ -186,8 +186,8 @@ You can find all service on this table: | Service | Description | URL | | --- | --- | --- | -| Homepage | Homepage | [homepage.bensuperpc.org](https://homepage.bensuperpc.org) | -| Wordpress | Wordpress website | [bensuperpc.org](https://bensuperpc.org) and [www.bensuperpc.org](https://www.bensuperpc.org) | +| Homepage | Homepage | [www.bensuperpc.org](https://www.bensuperpc.org) | +| Wordpress | Wordpress website | [wordpress.bensuperpc.org](https://bensuperpc.org) | | Adminer | Adminer for MariaDB | [adminer.bensuperpc.org](https://adminer.bensuperpc.org) | | Uptime Kuma | Uptime Kuma for monitoring | [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) | | qbittorrent | qbittorrent server | [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | diff --git a/infrastructure/caddy/config/bensuperpc.org/Caddyfile b/infrastructure/caddy/config/bensuperpc.org/Caddyfile index 264f935..033ff5d 100644 --- a/infrastructure/caddy/config/bensuperpc.org/Caddyfile +++ b/infrastructure/caddy/config/bensuperpc.org/Caddyfile @@ -1,4 +1,16 @@ www.bensuperpc.org { + reverse_proxy homepage:3000 +} + +bensuperpc.org { + redir https://www.bensuperpc.org permanent +} + +homepage.bensuperpc.org { + redir https://www.bensuperpc.org{uri} permanent +} + +wordpress.bensuperpc.org { root * /var/www/html php_fastcgi wordpress:9000 @@ -35,10 +47,6 @@ www.bensuperpc.org { } } -bensuperpc.org { - redir https://www.bensuperpc.org{uri} permanent -} - adminer.bensuperpc.org { reverse_proxy adminer:8080 } @@ -101,10 +109,6 @@ pastebin.bensuperpc.org { redir https://privatebin.bensuperpc.org permanent } -homepage.bensuperpc.org { - reverse_proxy homepage:3000 -} - dozzle.bensuperpc.org { reverse_proxy dozzle:8080 } diff --git a/infrastructure/homepage/config/services.yaml b/infrastructure/homepage/config/services.yaml index 4bd325e..d8faa50 100644 --- a/infrastructure/homepage/config/services.yaml +++ b/infrastructure/homepage/config/services.yaml @@ -5,9 +5,9 @@ - Personal: - wordpress: icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/wordpress.png - href: https://www.bensuperpc.org/ + href: https://wordpress.bensuperpc.org/ description: Wordpress - ping: bensuperpc.org + ping: wordpress.bensuperpc.org container: wordpress - uptime-kuma: icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/uptime-kuma.png diff --git a/infrastructure/yacht/env/yacht.env b/infrastructure/yacht/env/yacht.env index 2731464..a6267a4 100644 --- a/infrastructure/yacht/env/yacht.env +++ b/infrastructure/yacht/env/yacht.env @@ -1,2 +1,3 @@ ADMIN_EMAIL=bensuperpc@gmail.com SECRET_KEY=UZvg9nbcGIJlPEB3uI39TAEWyFOz9nm8 +#DATABASE_URL=postgresql://user:password@postgresserver/db