From 1559ea8af6d0e8ea41e0eaf50dc249a8f05a2f52 Mon Sep 17 00:00:00 2001
From: redbeardymcgee <redbeardymcgee@gmail.com>
Date: Tue, 12 Nov 2024 19:57:09 -0600
Subject: [PATCH] incorporate secrets management

---
 quadlets/pointspend.container     | 2 +-
 quadlets/port-forward.container   | 2 +-
 quadlets/seedboxapi.container     | 3 ++-
 stacks/mam/README.md              | 6 ++++++
 stacks/mam/pointspend.container   | 2 +-
 stacks/mam/port-forward.container | 3 +--
 stacks/mam/seedboxapi.container   | 4 +---
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/quadlets/pointspend.container b/quadlets/pointspend.container
index 95a5297..c111e43 100644
--- a/quadlets/pointspend.container
+++ b/quadlets/pointspend.container
@@ -21,8 +21,8 @@ AutoUpdate=registry
 
 Network=container:gluetun
 
-Environment=MAMID=$mam_id
 Environment=BUFFER=1000
 Environment=WEDGEHOURS=0
 Environment=VIP=1
 
+Secret=mam_id,type=env,target=MAMID
diff --git a/quadlets/port-forward.container b/quadlets/port-forward.container
index 827984e..81c965c 100644
--- a/quadlets/port-forward.container
+++ b/quadlets/port-forward.container
@@ -23,7 +23,7 @@ AutoUpdate=registry
 Network=container:gluetun
 
 Environment=QBT_USERNAME=$qbt_user
-Environment=QBT_PASSWORD=$qbt_password
 Environment=QBT_ADDR=http://localhost:8080
 Environment=GTN_ADDR=http://localhost:8000
 
+Secret=qbt_pw,type=env,target=QBT_PASSWORD
diff --git a/quadlets/seedboxapi.container b/quadlets/seedboxapi.container
index 9e3a9d7..e6a38ad 100644
--- a/quadlets/seedboxapi.container
+++ b/quadlets/seedboxapi.container
@@ -24,5 +24,6 @@ Network=container:gluetun
 Volume=/volumes/books/seedboxapi/config:/config
 
 Environment=DEBUG=1
-Environment=mam_id=$mam_id
 Environment=interval=1
+
+Secret=mam_id,type=env,target=mam_id
diff --git a/stacks/mam/README.md b/stacks/mam/README.md
index 6e7a021..269611c 100644
--- a/stacks/mam/README.md
+++ b/stacks/mam/README.md
@@ -31,3 +31,9 @@ name = "qbittorrent"
 routes = ["GET /v1/openvpn/portforwarded"]
 auth = "none"
 ```
+
+## Secrets
+
+```bash
+printf $mam_id | podman secret create --replace --label STACK=MAM mam_id -
+```
diff --git a/stacks/mam/pointspend.container b/stacks/mam/pointspend.container
index 95a5297..c111e43 100644
--- a/stacks/mam/pointspend.container
+++ b/stacks/mam/pointspend.container
@@ -21,8 +21,8 @@ AutoUpdate=registry
 
 Network=container:gluetun
 
-Environment=MAMID=$mam_id
 Environment=BUFFER=1000
 Environment=WEDGEHOURS=0
 Environment=VIP=1
 
+Secret=mam_id,type=env,target=MAMID
diff --git a/stacks/mam/port-forward.container b/stacks/mam/port-forward.container
index 827984e..99d9916 100644
--- a/stacks/mam/port-forward.container
+++ b/stacks/mam/port-forward.container
@@ -14,7 +14,6 @@ WantedBy=default.target
 
 [Container]
 # TODO: Replace this with one that has tags
-# Probably have to repack my own
 Image=docker.io/mjmeli/qbittorrent-port-forward-gluetun-server:latest
 ContainerName=qbittorrent-port-forward
 HostName=qbittorrent-port-forward
@@ -23,7 +22,7 @@ AutoUpdate=registry
 Network=container:gluetun
 
 Environment=QBT_USERNAME=$qbt_user
-Environment=QBT_PASSWORD=$qbt_password
 Environment=QBT_ADDR=http://localhost:8080
 Environment=GTN_ADDR=http://localhost:8000
 
+Secret=qbt_pw,type=env,target=QBT_PASSWORD
diff --git a/stacks/mam/seedboxapi.container b/stacks/mam/seedboxapi.container
index 9e3a9d7..f4163c0 100644
--- a/stacks/mam/seedboxapi.container
+++ b/stacks/mam/seedboxapi.container
@@ -23,6 +23,4 @@ Network=container:gluetun
 
 Volume=/volumes/books/seedboxapi/config:/config
 
-Environment=DEBUG=1
-Environment=mam_id=$mam_id
-Environment=interval=1
+Secret=mam_id,type=env,target=mam_id