From 456451b125ae80a83bc748f0233c55f8eda0252a Mon Sep 17 00:00:00 2001
From: Galuh Sahid <galuh.tunggadewi@gmail.com>
Date: Mon, 25 Dec 2023 22:58:13 +0100
Subject: [PATCH] Change config

---
 restic/docker-compose.yml | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/restic/docker-compose.yml b/restic/docker-compose.yml
index 46856dd..ba8177e 100644
--- a/restic/docker-compose.yml
+++ b/restic/docker-compose.yml
@@ -14,8 +14,8 @@ services:
     environment:
       RUN_ON_STARTUP: 'true'
       BACKUP_CRON: '0 30 3 * * *' # backups run every day at 03:30
-      RESTIC_PASSWORD: /run/secrets/restic_password
-      RESTIC_REPOSITORY: b2:gal-velouria
+      RESTIC_PASSWORD: ${RESTIC_PASSWORD}
+      RESTIC_REPOSITORY: ${B2_BUCKET}
       RESTIC_BACKUP_SOURCES: /source
       RESTIC_BACKUP_ARGS: >-
         --tag docker-volumes
@@ -25,8 +25,8 @@ services:
         --keep-daily 7
         --keep-weekly 5
         --keep-monthly 12
-      B2_ACCOUNT_ID: /run/secrets/b2_account_id
-      B2_ACCOUNT_KEY: /run/secrets/b2_account_key
+      B2_ACCOUNT_ID: ${B2_ACCOUNT_ID}
+      B2_ACCOUNT_KEY: ${B2_ACCOUNT_KEY}
       TZ: 'Europe/Berlin'
     secrets:
       - b2_bucket
@@ -42,10 +42,10 @@ services:
     environment:
       RUN_ON_STARTUP: 'false'
       PRUNE_CRON: '0 0 4 * * *' # prune runs every day at 04:00
-      RESTIC_REPOSITORY: b2:gal-velouria
-      RESTIC_PASSWORD: /run/secrets/restic_password
-      B2_ACCOUNT_ID: /run/secrets/b2_account_id
-      B2_ACCOUNT_KEY: /run/secrets/b2_account_key
+      RESTIC_REPOSITORY: ${B2_BUCKET}
+      RESTIC_PASSWORD: ${RESTIC_PASSWORD}
+      B2_ACCOUNT_ID: ${B2_ACCOUNT_ID}
+      B2_ACCOUNT_KEY: ${B2_ACCOUNT_KEY}
       TZ: 'Europe/Berlin'
     secrets:
       - b2_bucket
@@ -63,10 +63,10 @@ services:
       CHECK_CRON: '0 30 4 * * *' # check runs every day at 04:30
       RESTIC_CHECK_ARGS: >-
         --read-data-subset=10%
-      RESTIC_REPOSITORY: b2:gal-velouria
-      RESTIC_PASSWORD: /run/secrets/restic_password
-      B2_ACCOUNT_ID: /run/secrets/b2_account_id
-      B2_ACCOUNT_KEY: /run/secrets/b2_account_key
+      RESTIC_REPOSITORY: ${B2_BUCKET}
+      RESTIC_PASSWORD: ${RESTIC_PASSWORD}
+      B2_ACCOUNT_ID: ${B2_ACCOUNT_ID}
+      B2_ACCOUNT_KEY: ${B2_ACCOUNT_KEY}
       TZ: 'Europe/Berlin'
     secrets:
       - b2_bucket
@@ -76,13 +76,3 @@ services:
 
 networks:
   private: {}
-
-secrets:
-  restic_password:
-    file: /etc/secure_config/.restic_password.txt
-  b2_account_id:
-    file: /etc/secure_config/.b2_account_id.txt
-  b2_account_key:
-    file: /etc/secure_config/.b2_account_key.txt
-  b2_bucket:
-    file: /etc/secure_config/.b2_bucket.txt
\ No newline at end of file