From 6d1b79d07ed933082b5b35ba6e970d64a0681e05 Mon Sep 17 00:00:00 2001 From: Gal Date: Mon, 1 Jan 2024 00:19:01 +0300 Subject: [PATCH] Use .env --- .gitignore | 1 + actualbudget/README.md | 5 ++--- actualbudget/docker-compose.yml | 18 ++++++++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 420db2e..f0e02c8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ .env config.ini secrets.json +app.ini # Exclude node_modules if it's present in any of your services /node_modules/ diff --git a/actualbudget/README.md b/actualbudget/README.md index 16e147d..1614e70 100644 --- a/actualbudget/README.md +++ b/actualbudget/README.md @@ -3,10 +3,9 @@ Set up env ``` -ACTUAL_HTTPS_KEY_FILE_PATH='' -ACTUAL_HTTPS_CERT_FILE_PATH='' +ACTUAL_HTTPS_KEY='' +ACTUAL_HTTPS_CERT='' ``` ## Improvements - - Set up https via Tailscale https://tailscale.com/kb/1153/enabling-https?ref=traefik.io diff --git a/actualbudget/docker-compose.yml b/actualbudget/docker-compose.yml index 37130ed..86284ef 100644 --- a/actualbudget/docker-compose.yml +++ b/actualbudget/docker-compose.yml @@ -3,14 +3,24 @@ services: actual_server: image: docker.io/actualbudget/actual-server:latest ports: - - "100.104.163.2:5006:5006" + - "5006:5006" environment: - - ACTUAL_HTTPS_KEY=/certs/key.pem - - ACTUAL_HTTPS_CERT=/certs/cert.pem - ACTUAL_UPLOAD_FILE_SYNC_SIZE_LIMIT_MB=20 - ACTUAL_UPLOAD_SYNC_ENCRYPTED_FILE_SYNC_SIZE_LIMIT_MB=50 - ACTUAL_UPLOAD_FILE_SIZE_LIMIT_MB=20 volumes: - ${HOME}/certs:/certs - ${PWD}/actual-data:/data - restart: unless-stopped \ No newline at end of file + restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.routers.actualserver.rule=Host(`$DOMAIN`)" + - "traefik.http.routers.gitea.entrypoints=websecure" + - "traefik.http.routers.gitea.tls.certresolver=myresolver" + - "traefik.http.services.gitea.loadbalancer.server.port=5006" + - "traefik.http.services.actualserver.loadbalancer.server.ip=${SERVER_IP}" + - "traefik.docker.network=traefik_network" + +networks: + traefik_network: + external: true \ No newline at end of file