From 5bba9d66df718d1c5b9f976b80baddbbc29b5283 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Thu, 8 May 2025 09:21:33 -0500
Subject: [PATCH] Add Firefly + caddy config

---
 caddy/Caddyfile             | 11 ++++++++++-
 firefly/.db.env             |  1 -
 firefly/.env                |  4 ++--
 firefly/.importer.env       |  4 ++--
 firefly/docker-compose.yaml |  4 ++--
 restartcaddy.sh             |  0
 6 files changed, 16 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 restartcaddy.sh

diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index fb7edef..7cdad1c 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -74,7 +74,6 @@ excalidraw.home.domroese.eu:443 {
     tls soenke@domroese.eu        
     reverse_proxy 192.168.1.65:8267
 }
-
 homarr.home.domroese.eu:443 {
     tls soenke@domroese.eu        
     reverse_proxy 192.168.1.65:7575
@@ -105,6 +104,16 @@ wallos.home.domroese.eu:443 {
     reverse_proxy 192.168.1.65:8282
 }
 
+firefly.home.domroese.eu:443 {
+    tls soenke@domroese.eu        
+    reverse_proxy 192.168.1.65:8950
+}
+
+import.firefly.home.domroese.eu:443 {
+    tls soenke@domroese.eu        
+    reverse_proxy 192.168.1.65:8951
+}
+
 plantit.home.domroese.eu:443 {
     tls soenke@domroese.eu        
     reverse_proxy 192.168.1.65:3632
diff --git a/firefly/.db.env b/firefly/.db.env
index 803eb16..1027d20 100644
--- a/firefly/.db.env
+++ b/firefly/.db.env
@@ -2,4 +2,3 @@ MYSQL_RANDOM_ROOT_PASSWORD=yes
 MYSQL_USER=firefly
 MYSQL_PASSWORD=yZtpsAr!hmRG@oNN5Is8giT5egK*df4R
 MYSQL_DATABASE=firefly
-MYSQL_PORT=3606
\ No newline at end of file
diff --git a/firefly/.env b/firefly/.env
index a305e9e..787db1f 100644
--- a/firefly/.env
+++ b/firefly/.env
@@ -16,7 +16,7 @@ SITE_OWNER=soenke@domroese.eu
 #
 # Avoid the "#" character in your APP_KEY, it may break things.
 #
-APP_KEY=fFYwIv$M%dwkqAK3*sZz4zWrihp@QYN*0$DtoB1vW%Yg32Ui980ZV^4M7@pG$*Tw
+APP_KEY=9u8U6ZhrennOoD1cz9I8OvLExxYdJcC8
 
 # Firefly III will launch using this language (for new users and unauthenticated visitors)
 # For a list of available languages: https://github.com/firefly-iii/firefly-iii/blob/main/config/firefly.php#L123
@@ -85,7 +85,7 @@ PAPERTRAIL_PORT=
 # Use "sqlite" for SQLite.
 DB_CONNECTION=mysql
 DB_HOST=db
-DB_PORT=3606
+DB_PORT=3306
 DB_DATABASE=firefly
 DB_USERNAME=firefly
 DB_PASSWORD=yZtpsAr!hmRG@oNN5Is8giT5egK*df4R
diff --git a/firefly/.importer.env b/firefly/.importer.env
index 7c1a40e..a5947fb 100644
--- a/firefly/.importer.env
+++ b/firefly/.importer.env
@@ -55,8 +55,8 @@ FIREFLY_III_CLIENT_ID=
 # GoCardless information.
 # The key and ID can be set from a file if you append it with _FILE
 #
-NORDIGEN_ID=
-NORDIGEN_KEY=
+NORDIGEN_ID=fa30fd01-ce54-41df-aa6f-f268992ae176
+NORDIGEN_KEY=39967f83a916cb10fe19225ca142a74c9aac3647fe1ad933ea4d251ab295fc099eca93ce9a2c4616cb55a388e8bc8b9cf97da541c6e354620c8b4f642f111b72
 
 #
 # If you want to use the GoCardless sandbox, set this to true.
diff --git a/firefly/docker-compose.yaml b/firefly/docker-compose.yaml
index 2931c38..798edac 100644
--- a/firefly/docker-compose.yaml
+++ b/firefly/docker-compose.yaml
@@ -18,7 +18,7 @@ services:
       - firefly_iii_upload:/var/www/html/storage/upload
     env_file: .env
     ports:
-      - '80:8080'
+      - '8950:8080'
     depends_on:
       - db
   db:
@@ -40,7 +40,7 @@ services:
     networks:
       - firefly_iii
     ports:
-      - '81:8080'
+      - '8951:8080'
     depends_on:
       - app
     env_file: .importer.env
diff --git a/restartcaddy.sh b/restartcaddy.sh
old mode 100644
new mode 100755