README.md

@@ -67,8 +67,8 @@ And then, caddy will generate the certificate for you and renew it automatically
 
 | Domain name | Type | Description |
 | --- | --- | --- |
-| [www.bensuperpc.org](https://www.bensuperpc.org) | Main | Homepage |
-| [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org) | Sub | Wordpress website |
+| [homepage.bensuperpc.org](https://homepage.bensuperpc.org) | Sub | Homepage |
+| [bensuperpc.org](https://bensuperpc.org) | Main | Main domain |
 | [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 | [www.bensuperpc.org](https://www.bensuperpc.org) |
-| Wordpress | Wordpress website | [wordpress.bensuperpc.org](https://bensuperpc.org) |
+| 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) |
 | 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) |

infrastructure/caddy/config/bensuperpc.org/Caddyfile

@@ -1,16 +1,4 @@
 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
 
@@ -47,6 +35,10 @@ wordpress.bensuperpc.org {
 	}
 }
 
+bensuperpc.org {
+	redir https://www.bensuperpc.org{uri} permanent
+}
+
 adminer.bensuperpc.org {
 	reverse_proxy adminer:8080
 }
@@ -109,6 +101,10 @@ pastebin.bensuperpc.org {
 	redir https://privatebin.bensuperpc.org permanent
 }
 
+homepage.bensuperpc.org {
+	reverse_proxy homepage:3000
+}
+
 dozzle.bensuperpc.org {
 	reverse_proxy dozzle:8080
 }

infrastructure/homepage/config/bookmarks.yaml

@@ -6,34 +6,13 @@
     - Github:
         - abbr: GH
           href: https://github.com/bensuperpc
-          description: github.com
 
 - Social:
     - Reddit:
         - abbr: RE
           href: https://reddit.com/u/bensuperpc
-          description: reddit.com
-    - Twitter:
-        - abbr: TW
-          href: https://twitter.com/bensuperpc
-          description: twitter.com
 
 - Entertainment:
     - YouTube:
         - abbr: YT
           href: https://youtube.com/c/bensuperpc
-          description: youtube.com
-
-- Friends:
-    - Rickkrict:
-        - abbr: RK
-          href: https://gnous.eu/
-          description: gnous.eu
-    - Proxy:
-        - abbr: IM
-          href: https://imagisphe.re/
-          description: imagisphe.re
-    - Greep:
-        - abbr: GP
-          href: https://greep.fr/#/
-          description: greep.fr

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://wordpress.bensuperpc.org/
+        href: https://www.bensuperpc.org/
         description: Wordpress
-        ping: wordpress.bensuperpc.org
+        ping: bensuperpc.org
         container: wordpress
     - uptime-kuma:
         icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/uptime-kuma.png

infrastructure/homepage/config/settings.yaml

@@ -4,7 +4,7 @@
 
 title: Bensuperpc
 
-base: https://www.bensuperpc.org
+base: https://homepage.bensuperpc.org
 
 favicon: /images/favicon.ico
 

infrastructure/yacht/env/yacht.env

@@ -1,3 +1,2 @@
 ADMIN_EMAIL=bensuperpc@gmail.com
 SECRET_KEY=UZvg9nbcGIJlPEB3uI39TAEWyFOz9nm8
-#DATABASE_URL=postgresql://user:password@postgresserver/db