Initial commit

.env.sample

@@ -8,7 +8,6 @@ TZ=Europe/Amsterdam
 DEFAULT_LANGUAGE=en_US
 DEFAULT_LOCALE=equal
 APP_DEBUG=false
-APP_LOG_LEVEL=notice
 # You can disable the Content Security Policy header when you're using an ancient browser
 # or any version of Microsoft Edge / Internet Explorer (which amounts to the same thing really)
 # This leaves you with the risk of not being able to stop XSS bugs should they ever surface.
@@ -16,14 +15,14 @@ APP_LOG_LEVEL=notice
 DISABLE_CSP_HEADER=false
 # Webhooks are ecurity sensitive!
 ALLOW_WEBHOOKS=false
+# 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=
 
 SECRET_APP_KEY_VERSION=v1           # length=32
 SECRET_STATIC_CRON_TOKEN_VERSION=v1 # length=32
 SECRET_DB_PASSWORD_VERSION=v1       # length=32
 
-# REDIS
-# COMPOSE_FILE="compose.yml:compose.redis.yml"
-
 # TODO: Implement redis/memcached (see: https://github.com/firefly-iii/firefly-iii/blob/10545f3e1baf5c53097392887f38469ffb75cab5/.env.example#L91)
 # TODO: Implement mail (see: https://github.com/firefly-iii/firefly-iii/blob/10545f3e1baf5c53097392887f38469ffb75cab5/.env.example#L123)
 # TODO: Implement map (https://github.com/firefly-iii/firefly-iii/blob/10545f3e1baf5c53097392887f38469ffb75cab5/.env.example#L159)

compose.redis.yml

@@ -1,25 +0,0 @@
-version: "3.8"
-services:
-  app:
-    environment:
-      - CACHE_DRIVER=redis
-      - SESSION_DRIVER=redis
-      - REDIS_SCHEME=tcp
-      - REDIS_PATH=
-      - REDIS_HOST=redis
-      - REDIS_PORT=6379
-      - REDIS_DB="0"
-      - REDIS_CACHE_DB="1"
-      - REDIS_PASSWORD=null
-  redis:
-    image: redis:alpine
-    command: redis-server
-    volumes:
-      - redis-data:/data
-      - redis-conf:/usr/local/etc/redis/redis.conf
-    networks:
-      - internal
-volumes:
-  redis-data:
-  redis-conf:
-

compose.yml

@@ -19,12 +19,10 @@ services:
       - DISABLE_CSP_HEADER
       - ALLOW_WEBHOOKS
       - TRUSTED_PROXIES
-      - APP_LOG_LEVEL
-      - APP_URL=${DOMAIN}
       - APP_KEY_FILE=/run/secrets/app_key
-      - CRON_TOKEN_FILE=/run/secrets/cron_token
       - STATIC_CRON_TOKEN_FILE=
       - LOG_CHANNEL=stack
+      - APP_LOG_LEVEL=notice
       - AUDIT_LOG_LEVEL=info
       - DB_CONNECTION=pgsql
       - DB_HOST=db
@@ -40,7 +38,7 @@ services:
       - CACHE_DRIVER=file
       - SESSION_DRIVER=file
       - COOKIE_PATH="/"
-      - COOKIE_DOMAIN=${DOMAIN}
+      - COOKIE_DOMAIN=
       - COOKIE_SECURE=false
       - COOKIE_SAMESITE=lax
       - SEND_REGISTRATION_MAIL=false
@@ -69,7 +67,7 @@ services:
       - DEMO_PASSWORD=
       - IS_HEROKU=false
       - FIREFLY_III_LAYOUT=v1
-      - TRUSTED_PROXIES=**
+      - APP_URL=http://localhost
     depends_on:
       - db
     networks:
@@ -102,16 +100,11 @@ services:
       - POSTGRES_USER=firefly
       - POSTRES_DB=firefly
     volumes:
-      - "firefly_iii_db:/var/lib/postgresql/data"
+      - firefly_iii_db:/var/lib/mysql
     secrets:
       - db_password
     networks:
       - internal
-  cron:
-    image: alpine
-    command: sh -c "echo \"0 3 * * * wget -qO- https://${DOMAIN}/api/v1/cron/`cat /run/secrets/cron_token`\" | crontab - && crond -f -L /dev/stdout"
-    secrets:
-      - cron_token
 networks:
   internal:
   proxy:
@@ -129,3 +122,8 @@ secrets:
   db_password:
     name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
     external: true
+#  cron:
+#    image: alpine
+#    command: command: sh -c "echo \"0 3 * * * wget -qO- https://<Firefly III URL>/api/v1/cron/<TOKEN>\" | crontab - && crond -f -L /dev/stdout"
+#    secrets:
+#      - cron_token