From 5358e6f40aa760cda4ab43b7ad375db80f6bdb36 Mon Sep 17 00:00:00 2001 From: Laur Ivan Date: Mon, 15 May 2023 11:41:49 +0200 Subject: [PATCH] fix: Use app key for firefly. --- defaults/main.yml | 6 +++++- templates/env.firefly.conf.j2 | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2dab3fc..7004986 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,9 +1,11 @@ --- ## General -firefly_image: firefly:latest +firefly_image: "fireflyiii/core:latest" +firefly_import_image: "fireflyiii/data-importer:latest" firefly_http_port_app: 30000 +firefly_http_port_import: 30001 firefly_timezone: "Europe/Brussels" @@ -19,6 +21,7 @@ firefly_owner_email: "user@domain.com" firefly_db_password: "changeme" firefly_app_name: "Firefly III" +firefly_app_url: "http://10.0.0.35:30000" # Cronjob token, must be 32 chars long firefly_static_cron_token: "12345678901234567890123456789012" @@ -36,6 +39,7 @@ firefly_configuration_files: - "docker-compose.yml" - "env.firefly.conf" - "env.db.conf" + - "env.firefly-import.conf" # Documentation firefly_documentation_link: "https://www.laurivan.com" diff --git a/templates/env.firefly.conf.j2 b/templates/env.firefly.conf.j2 index 01d5af3..a1efc26 100644 --- a/templates/env.firefly.conf.j2 +++ b/templates/env.firefly.conf.j2 @@ -16,7 +16,7 @@ SITE_OWNER={{ firefly_owner_email }} # # Avoid the "#" character in your APP_KEY, it may break things. # -APP_KEY=SomeRandomStringOf32CharsExactly +APP_KEY={{ firefly_app_key }} # 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/tree/main/resources/lang