From df5f7613915eff592869ba37f2d3bcb041e6bae3 Mon Sep 17 00:00:00 2001
From: Florent Guiotte <florent.guiotte@irisa.fr>
Date: Fri, 19 May 2023 17:47:20 +0200
Subject: [PATCH] Refactor secrets

---
 docker-compose.override.yml | Bin 114 -> 0 bytes
 docker-compose.yml          |  27 ++++++++++++++++++++++-----
 lychee-db-pw.secret         | Bin 0 -> 32 bytes
 lychee-db-root-pw.secret    | Bin 0 -> 34 bytes
 transmission-pw.secret      | Bin 0 -> 36 bytes
 transmission-user.secret    | Bin 0 -> 29 bytes
 6 files changed, 22 insertions(+), 5 deletions(-)
 delete mode 100644 docker-compose.override.yml
 create mode 100644 lychee-db-pw.secret
 create mode 100644 lychee-db-root-pw.secret
 create mode 100644 transmission-pw.secret
 create mode 100644 transmission-user.secret

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
deleted file mode 100644
index 12371102ebc1c6dbd5b8b09d0762d405b04f6e3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 114
zcmV-&0FD0uM@dveQdv+`0FrZS(i6;S`QPC|LRfWl%&KG8BGF%>=Y`dR#W}<C6^G~~
z^oi@q&6nlT;`w#HWE5MB1zhIU{b|L{PL&3qH7j!Tc6KdoYX46@M0G2FvI)!C{JHrz
Upg;<F5#jbrAJCtt9&LJcK{Gi!1poj5

diff --git a/docker-compose.yml b/docker-compose.yml
index eb8c3be..65de9bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,6 +64,8 @@ services:
     container_name: transmission
     environment:
       <<: *common-environment
+      FILE__USER: /run/secrets/transmission-user
+      FILE__PASS: /run/secrets/transmission-pw
     volumes:
       - transmission-config:/config
       - /mnt/storage/download:/downloads
@@ -73,6 +75,9 @@ services:
       - 51413:51413
       - 51413:51413/udp
     restart: unless-stopped
+    secrets:
+      - transmission-user
+      - transmission-pw
 
         # WIP
         #  radarr:
@@ -94,13 +99,12 @@ services:
   syncthing:
     image: lscr.io/linuxserver/syncthing:latest
     container_name: syncthing
-    hostname: drmanhattan #optional
+    hostname: drmanhattan
     environment: *common-environment
     volumes:
       - ./syncthing:/config
       - /mnt/storage/music/Florent:/music
     ports:
-      #- 8384:8384
       - 22000:22000/tcp
       - 22000:22000/udp
       - 21027:21027/udp
@@ -115,10 +119,13 @@ services:
       - lychee-db:/config
     environment:
       <<: *common-environment
-      MYSQL_ROOT_PASSWORD: rootpassword
+      FILE__MYSQL_ROOT_PASSWORD: /run/secrets/lychee-db-root-pw
+      FILE__MYSQL_PASSWORD: /run/secrets/lychee-db-pw
       MYSQL_DATABASE: lychee
       MYSQL_USER: lychee
-      MYSQL_PASSWORD: dbpassword
+    secrets:
+      - lychee-db-root-pw
+      - lychee-db-pw
 
 
   lychee:
@@ -132,11 +139,13 @@ services:
       - lychee-pictures:/pictures
     environment:
       <<: *common-environment
+      FILE__DB_PASSWORD: /run/secrets/lychee-db-pw
       DB_HOST: lychee-db
       DB_USERNAME: lychee
-      DB_PASSWORD: dbpassword
       DB_DATABASE: lychee
       DB_PORT: 3306
+    secrets:
+      - lychee-db-pw
 
         # WIP
         #  zotero:
@@ -227,7 +236,15 @@ volumes:
 
 
 secrets:
+  lychee-db-root-pw:
+    file: lychee-db-root-pw.secret
+  lychee-db-pw:
+    file: lychee-db-pw.secret
   nextcloud-db-root-pw:
     file: nextcloud-db-root-pw.secret
   nextcloud-db-pw:
     file: nextcloud-db-pw.secret
+  transmission-user:
+    file: transmission-user.secret
+  transmission-pw:
+    file: transmission-pw.secret
diff --git a/lychee-db-pw.secret b/lychee-db-pw.secret
new file mode 100644
index 0000000000000000000000000000000000000000..1ae551c2a38e0ac9aa4fa4c3aedc10f397e51444
GIT binary patch
literal 32
ocmZQ@_Y83kiVO&02$54&I9&F_lEdcc*@K<gs@2br8hJ4Q0IakN>i_@%

literal 0
HcmV?d00001

diff --git a/lychee-db-root-pw.secret b/lychee-db-root-pw.secret
new file mode 100644
index 0000000000000000000000000000000000000000..6ff0287b533ff955f24fcefa932902490fc8872e
GIT binary patch
literal 34
qcmZQ@_Y83kiVO&0_;1ZCZ~o?3B@ffDo_UKh-iE6O%}xjrbN~R+6Aah@

literal 0
HcmV?d00001

diff --git a/transmission-pw.secret b/transmission-pw.secret
new file mode 100644
index 0000000000000000000000000000000000000000..7a71b835ad96827db7dc78e08e634603b58a9dd1
GIT binary patch
literal 36
scmZQ@_Y83kiVO&0_^UbdPDOgq1B3F-l3lKb-WD4t?PwDbk2-4%0QfZy9{>OV

literal 0
HcmV?d00001

diff --git a/transmission-user.secret b/transmission-user.secret
new file mode 100644
index 0000000000000000000000000000000000000000..d38f34b0742e2901e7d560f141ad9b90bd689975
GIT binary patch
literal 29
lcmZQ@_Y83kiVO&0kWIcJbxf|Bg>jSbv`GD5Wjh3S0sw@D3S0mH

literal 0
HcmV?d00001