From d3efb8516a0f05456897411fc1bf2e9e2be64ed6 Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 13 May 2025 01:19:53 -0500 Subject: [PATCH] asd --- caddy/Caddyfile | 5 ----- firefly/.env | 7 ++++--- firefly/.importer.env | 34 ++++++++++++++++++---------------- firefly/docker-compose.yaml | 3 ++- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 7cdad1c..a76eef2 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -109,11 +109,6 @@ firefly.home.domroese.eu:443 { 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/.env b/firefly/.env index 787db1f..58bc0ba 100644 --- a/firefly/.env +++ b/firefly/.env @@ -35,7 +35,7 @@ TZ=Europe/Berlin # TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy. # Set it to ** and reverse proxies work just fine. -TRUSTED_PROXIES= +TRUSTED_PROXIES=** # The log channel defines where your log entries go to. # Several other options exist. You can use 'single' for one big fat error log (not recommended). @@ -219,7 +219,7 @@ MAP_DEFAULT_ZOOM=6 # To change this, set your preferred comma separated set below. # Be sure to include http, https and other default ones if you need to. # -VALID_URL_PROTOCOLS= +VALID_URL_PROTOCOLS=https,http # # Firefly III authentication settings @@ -342,4 +342,5 @@ QUERY_PARSER_IMPLEMENTATION=legacy # 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=http://localhost +APP_URL=https://firefly.home.domroese.eu +#APP_URL=http://localhost diff --git a/firefly/.importer.env b/firefly/.importer.env index a5947fb..91e616d 100644 --- a/firefly/.importer.env +++ b/firefly/.importer.env @@ -10,7 +10,7 @@ # # This variable can be set from a file if you append it with _FILE # -FIREFLY_III_URL=http://app:8080 +FIREFLY_III_URL=https://firefly.home.domroese.eu # # Imagine Firefly III can be reached at "http://172.16.0.2:8082" (internal Docker network or something). @@ -25,7 +25,8 @@ FIREFLY_III_URL=http://app:8080 # # This variable can be set from a file if you append it with _FILE # -VANITY_URL=http://localhost +VANITY_URL=https://firefly.home.domroese.eu + # # Set your Firefly III Personal Access Token (OAuth) @@ -39,7 +40,7 @@ VANITY_URL=http://localhost # # This variable can be set from a file if you append it with _FILE # -FIREFLY_III_ACCESS_TOKEN= +FIREFLY_III_ACCESS_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJhdWQiOiIxIiwianRpIjoiMDA3ZjdjMjUwOTNlNzg2YWRkN2U1ZGNmYjA4MjFjMzYwMTE3MjQ0ZTZkMzM1MWQ1OTYzNzgwYjhmZDMzNmE4ODI4MDFiZGE3MTMzMTM3MjAiLCJpYXQiOjE3NDY3NzIyNzMuOTM4MTg0LCJuYmYiOjE3NDY3NzIyNzMuOTM4MTg1LCJleHAiOjE3NzgzMDgyNzMuODM3MTYzLCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.Lbw72vjJCHRhMnNm1qWwmMICRiTe1Vp6KuBIrZlpdcSCjZlsL3RIoYNyPmNECAcP2PVCyb36ZmlWtyOsx2C1BiwRtO-jnwWytxr9WZ-40e9-mnf7OnZRN6XOiCNzbKKyxaqM1yskwwfcW7vfkYAugD5HcffHMgkAoeeIa87HBVVV3eAsjWJ4aQ7NBBgET_GGMWDRYBnLn10k_vY_IXGQxqYivSpos0953f-7JriT_Yj-EzMzh6exOQbe3C_UF0Y9hGF6pjS7C4Sj9_Q45j3bs2nX7SJaUa-O4kn31EN0KCWSeYIFK1ugViauEZ7wHQhCG_X82GrqY_oiVS94WT4mxOwmb21vssO8lNj8WDaHzQQ2VV38SdLJMSWDN9-BdWB6HNEcIMHriW5oPQ2rQy5y5eETcF4B8ntHYUEQ9g52jmAUVEAVBLUjWUkNlljE6j9lOpsd_5IaLJIpjMlFnaWmadcZpN1po8lZB_Nfw2hihdx7ITMyhxBwjEIQRkH-wP0KJd8kVBIvUGCiLYxYhCQODJ6ddZaQDQaNHl0V-G6cwNIX1zFksVHEhP8YgxbB5q5zAcGla4aR9vX3pAHKxTejW4UvOMIu-t4vxAfVflHnEa6CboDqh7DYlj134q9A4lucBVo7SEsw2gyFGXMej2YsYnnhP5DiJAHV3jV2Fk_03Rg # # You can also use a public client ID. This is available in Firefly III 5.4.0-alpha.3 and higher. @@ -49,7 +50,7 @@ FIREFLY_III_ACCESS_TOKEN= # # This variable can be set from a file if you append it with _FILE # -FIREFLY_III_CLIENT_ID= +# FIREFLY_III_CLIENT_ID=2 # # GoCardless information. @@ -82,7 +83,7 @@ GOCARDLESS_GET_ACCOUNT_DETAILS=false # This is disabled by default, since it costs a lot of API calls. # You can enable it if you want to. # -GOCARDLESS_GET_BALANCE_DETAILS=false +GOCARDLESS_GET_BALANCE_DETAILS=true # # Spectre information @@ -134,20 +135,20 @@ AUTO_IMPORT_SECRET= # Is the /autoimport even endpoint enabled? # By default it's disabled, and the secret alone will not enable it. # -CAN_POST_AUTOIMPORT=false +CAN_POST_AUTOIMPORT=true # # Is the /autoupload endpoint enabled? # By default it's disabled, and the secret alone will not enable it. # -CAN_POST_FILES=false +CAN_POST_FILES=true # # Import directory white list. You need to set this before the auto importer will accept a directory to import from. # # This variable can be set from a file if you append it with _FILE # -IMPORT_DIR_ALLOWLIST= +IMPORT_DIR_ALLOWLIST=/import # # If you import from a directory, you can save a fallback configuration file in the directory. @@ -208,14 +209,14 @@ TRUSTED_PROXIES= # # Time zone # -TZ=Europe/Amsterdam +TZ=Europe/Berlin # # Email settings. # The data importer can send you a message with all errors, warnings and messages # after a successful import. This is disabled by default # -ENABLE_MAIL_REPORT=false +ENABLE_MAIL_REPORT=true # # Force Firefly III URL to be secure? @@ -231,15 +232,15 @@ EXPECT_SECURE_URL=false MAIL_MAILER= # where to send the report? -MAIL_DESTINATION=noreply@example.com +MAIL_DESTINATION=soenke@domroese.eu # other mail settings # These variables can be set from a file if you append it with _FILE -MAIL_FROM_ADDRESS=noreply@example.com -MAIL_HOST=smtp.mailtrap.io -MAIL_PORT=2525 -MAIL_USERNAME=username -MAIL_PASSWORD=password +MAIL_FROM_ADDRESS=soenke@domroese.eu +MAIL_HOST=pro1.mail.ovh.net +MAIL_PORT=587 +MAIL_USERNAME=mail@domroese.eu +MAIL_PASSWORD=aiVLNjATdm3CyLSCfjNhz4RPqpkvch MAIL_ENCRYPTION=null # Extra settings depending on your mail configuration above. @@ -291,3 +292,4 @@ APP_NAME=DataImporter # Laravel uses this to generate links on the command line, which is a feature the data importer does not use. # APP_URL=http://localhost + diff --git a/firefly/docker-compose.yaml b/firefly/docker-compose.yaml index 798edac..1cc5565 100644 --- a/firefly/docker-compose.yaml +++ b/firefly/docker-compose.yaml @@ -44,7 +44,8 @@ services: depends_on: - app env_file: .importer.env - + volumes: + - /home/soenke/docker-data/firefly/import:/import cron: # # To make this work, set STATIC_CRON_TOKEN in your .env file or as an environment variable and replace REPLACEME below