From fd8e77be246fcc712331baf77e08bbf70c08efe8 Mon Sep 17 00:00:00 2001
From: mathieu <lecoiffiermathieu@gmail.com>
Date: Sat, 8 Jun 2024 15:15:49 +0200
Subject: [PATCH] chore: change domain

---
 firefly/.env                |  2 +-
 firefly/.importer.env       |  4 ++--
 homepage/conf/settings.yaml |  2 +-
 joplin/docker-compose.yml   |  2 +-
 traefik/rules.yaml          | 27 ++++++++++++---------------
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/firefly/.env b/firefly/.env
index 5a1b5fa..f8abf34 100644
--- a/firefly/.env
+++ b/firefly/.env
@@ -297,4 +297,4 @@ FIREFLY_III_LAYOUT=v1
 # Please make sure this URL matches the external URL of your Firefly III installation.
 # It is used to validate specific requests and to generate URLs in emails.
 #
-APP_URL=https://huguettes.freeboxos.fr/firefly/
\ No newline at end of file
+APP_URL=https://firefly.huguette.ovh/
\ No newline at end of file
diff --git a/firefly/.importer.env b/firefly/.importer.env
index 9e147fc..7f9f7f9 100644
--- a/firefly/.importer.env
+++ b/firefly/.importer.env
@@ -25,7 +25,7 @@ FIREFLY_III_URL=http://app:8080
 #
 # This variable can be set from a file if you append it with _FILE
 #
-VANITY_URL=https://huguettes.freeboxos.fr/firefly/
+VANITY_URL=https://firefly.huguette.ovh/
 
 #
 # Set your Firefly III Personal Access Token (OAuth)
@@ -265,4 +265,4 @@ APP_NAME=DataImporter
 # Don't open issues telling me it doesn't help because it's not supposed to.
 # Laravel uses this to generate links on the command line, which is a feature the data importer does not use.
 #
-APP_URL=https://huguettes.freeboxos.fr/firefly/
\ No newline at end of file
+APP_URL=https://firefly.huguette.ovh/
\ No newline at end of file
diff --git a/homepage/conf/settings.yaml b/homepage/conf/settings.yaml
index b98d56a..ac805fa 100644
--- a/homepage/conf/settings.yaml
+++ b/homepage/conf/settings.yaml
@@ -1,6 +1,6 @@
 title: My Awesome Homepage
 
-startUrl: https://huguettes.freeboxos.fr/home
+startUrl: https://home.huguette.ovh
 
 layout:
   Media:
diff --git a/joplin/docker-compose.yml b/joplin/docker-compose.yml
index 28ac42e..7faa121 100644
--- a/joplin/docker-compose.yml
+++ b/joplin/docker-compose.yml
@@ -20,7 +20,7 @@ services:
         restart: unless-stopped
         environment:
             - APP_PORT=22300
-            - APP_BASE_URL=https://huguettes.freeboxos.fr/joplin/
+            - APP_BASE_URL=https://joplin.huguette.ovh/
             - DB_CLIENT=pg
             - POSTGRES_PASSWORD=postgres
             - POSTGRES_DATABASE=joplin
diff --git a/traefik/rules.yaml b/traefik/rules.yaml
index c606a60..b9a7c70 100644
--- a/traefik/rules.yaml
+++ b/traefik/rules.yaml
@@ -18,28 +18,25 @@ http:
       middlewares: 
         - stripprefixregex
     router-firefly:
-      rule: "Host(`huguettes.freeboxos.fr`) && PathPrefix(`/firefly`)"
+      rule: "Host(`firefly.huguette.ovh`)"
       service: "service-firefly"
-      tls: {}
-      middlewares: 
-        - stripprefixregex-firefly
+      tls:
+        resolver: myresolver
     router-homepage:
-      rule: "Host(`huguettes.freeboxos.fr`) && PathPrefix(`/home`)"
+      rule: "Host(`home.huguette.ovh`)"
       service: "service-homepage"
-      tls: {}
-      middlewares: 
-        - stripprefixregex
+      tls:
+        resolver: myresolver
     router-joplin:
-      rule: "Host(`huguettes.freeboxos.fr`) && PathPrefix(`/joplin`)"
+      rule: "Host(`joplin.huguette.ovh`)"
       service: "service-joplin"
-      tls: {}
-      middlewares: 
-        - stripprefixregex
+      tls: 
+        resolver: myresolver
     router-actual:
-      rule: "Host(`huguettes.freeboxos.fr`) && PathPrefix(`/actual`)"
+      rule: "Host(`actual.huguette.ovh`)"
       service: "service-actual"
-      tls: {}
-
+      tls: 
+        resolver: myresolver
 
       
   services: