feat: add Firefly III template

blueprints/firefly-iii/docker-compose.yml

@@ -2,11 +2,33 @@ version: "3.8"
 
 services:
   firefly-iii:
+<<<<<<< HEAD
+    image: fireflyiii/core:version-6.6.2
+=======
     image: fireflyiii/core:version-6.6.3
+>>>>>>> origin/canary
     restart: unless-stopped
     depends_on:
       firefly-iii-db:
         condition: service_healthy
+<<<<<<< HEAD
+    expose:
+      - 8080
+    environment:
+      APP_KEY: ${APP_KEY}
+      APP_URL: ${APP_URL}
+      TRUSTED_PROXIES: ${TRUSTED_PROXIES}
+      DB_CONNECTION: mysql
+      DB_HOST: firefly-iii-db
+      DB_PORT: 3306
+      DB_DATABASE: firefly
+      DB_USERNAME: firefly
+      DB_PASSWORD: ${DB_PASSWORD}
+      STATIC_CRON_TOKEN: ${STATIC_CRON_TOKEN}
+      TZ: ${TZ}
+      DEFAULT_LANGUAGE: ${DEFAULT_LANGUAGE}
+      LOG_CHANNEL: stack
+=======
     environment:
       APP_KEY: ${APP_KEY}
       APP_URL: ${APP_URL}
@@ -24,13 +46,44 @@ services:
       STATIC_CRON_TOKEN: ${STATIC_CRON_TOKEN}
     expose:
       - "8080"
+>>>>>>> origin/canary
     volumes:
       - firefly-iii-upload:/var/www/html/storage/upload
 
   firefly-iii-db:
     image: mariadb:11.8
     restart: unless-stopped
     environment:
+<<<<<<< HEAD
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: firefly
+      MYSQL_USER: firefly
+      MYSQL_PASSWORD: ${DB_PASSWORD}
+    volumes:
+      - firefly-iii-db:/var/lib/mysql
+    healthcheck:
+      test: ["CMD-SHELL", "healthcheck.sh --connect --innodb_initialized"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+
+  firefly-iii-importer:
+    image: fireflyiii/data-importer:version-2.3.2
+    restart: unless-stopped
+    depends_on:
+      - firefly-iii
+    expose:
+      - 8080
+    environment:
+      FIREFLY_III_URL: http://firefly-iii:8080
+      VANITY_URL: ${FIREFLY_III_VANITY_URL}
+      TRUSTED_PROXIES: ${TRUSTED_PROXIES}
+      TZ: ${TZ}
+      LOG_CHANNEL: stack
+      LOG_LEVEL: info
+    volumes:
+      - firefly-iii-import:/import
+=======
       MYSQL_DATABASE: ${DB_DATABASE}
       MYSQL_USER: ${DB_USERNAME}
       MYSQL_PASSWORD: ${DB_PASSWORD}
@@ -42,24 +95,40 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+>>>>>>> origin/canary
 
   firefly-iii-cron:
     image: alpine:3.22
     restart: unless-stopped
     depends_on:
       - firefly-iii
     environment:
+<<<<<<< HEAD
+      STATIC_CRON_TOKEN: ${STATIC_CRON_TOKEN}
+      TZ: ${TZ}
+=======
       TZ: ${TZ}
       STATIC_CRON_TOKEN: ${STATIC_CRON_TOKEN}
+>>>>>>> origin/canary
     command:
       - sh
       - -c
       - |
+<<<<<<< HEAD
+        apk add --no-cache tzdata wget
+        ln -s /usr/share/zoneinfo/$$TZ /etc/localtime || true
+        echo "0 3 * * * wget -qO- http://firefly-iii:8080/api/v1/cron/$$STATIC_CRON_TOKEN;echo" | crontab -
+=======
         apk add --no-cache tzdata wget && \
         (ln -snf /usr/share/zoneinfo/$$TZ /etc/localtime || true) && \
         echo "0 3 * * * wget -qO- http://firefly-iii:8080/api/v1/cron/$$STATIC_CRON_TOKEN; echo" | crontab - && \
+>>>>>>> origin/canary
         crond -f -L /dev/stdout
 
 volumes:
   firefly-iii-upload: {}
   firefly-iii-db: {}
+<<<<<<< HEAD
+  firefly-iii-import: {}
+=======
+>>>>>>> origin/canary

blueprints/firefly-iii/meta.json

@@ -1,9 +1,9 @@
 {
   "id": "firefly-iii",
   "name": "Firefly III",
-  "version": "6.6.3",
-  "description": "Firefly III is a self-hosted personal finance manager for tracking expenses, budgets, accounts, and financial reports.",
-  "logo": "logo.svg",
+  "version": "version-6.6.2",
+  "description": "Firefly III is a self-hosted personal finance manager for tracking expenses, income, budgets, and accounts.",
+  "logo": "firefly-iii.svg",
   "links": {
     "github": "https://github.com/firefly-iii/firefly-iii",
     "website": "https://www.firefly-iii.org/",
@@ -12,6 +12,7 @@
   "tags": [
     "finance",
     "budgeting",
+    "personal-finance",
     "self-hosted"
   ]
 }

blueprints/firefly-iii/template.toml

@@ -1,5 +1,18 @@
 [variables]
 main_domain = "${domain}"
+<<<<<<< HEAD
+importer_domain = "importer.${domain}"
+app_key = "${hash:16}"
+db_password = "${password:32}"
+mysql_root_password = "${password:32}"
+static_cron_token = "${hash:16}"
+app_url = "http://${main_domain}"
+firefly_iii_vanity_url = "http://${main_domain}"
+timezone = "UTC"
+default_language = "en_US"
+
+[config]
+=======
 app_key = "${base64:32}"
 db_name = "firefly"
 db_user = "firefly"
@@ -30,7 +43,27 @@ env = [
 ]
 mounts = []
 
+>>>>>>> origin/canary
 [[config.domains]]
 serviceName = "firefly-iii"
 port = 8080
 host = "${main_domain}"
+<<<<<<< HEAD
+
+[[config.domains]]
+serviceName = "firefly-iii-importer"
+port = 8080
+host = "${importer_domain}"
+
+[config.env]
+APP_KEY = "${app_key}"
+APP_URL = "${app_url}"
+FIREFLY_III_VANITY_URL = "${firefly_iii_vanity_url}"
+TRUSTED_PROXIES = "**"
+DB_PASSWORD = "${db_password}"
+MYSQL_ROOT_PASSWORD = "${mysql_root_password}"
+STATIC_CRON_TOKEN = "${static_cron_token}"
+TZ = "${timezone}"
+DEFAULT_LANGUAGE = "${default_language}"
+=======
+>>>>>>> origin/canary