From cc616d4433dd3e06b71b6c20cbc290c5283c99a5 Mon Sep 17 00:00:00 2001
From: Colin Hebert <active.luck0981@dedicated.contact>
Date: Sat, 21 Jan 2023 00:03:27 +0100
Subject: [PATCH] Simplify RPC creds setup (#2480)

Reduce the complexity associated with creating RPC creds
---
 openvpn/start.sh | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/openvpn/start.sh b/openvpn/start.sh
index 87418489d..e174e1ce5 100755
--- a/openvpn/start.sh
+++ b/openvpn/start.sh
@@ -219,17 +219,11 @@ else
 fi
 
 if [[ -f /run/secrets/rpc_creds ]]; then
-  #write creds if no file or contents are not the same.
-  if [[ ! -f /config/transmission-credentials.txt ]] || [[ "$(cat /run/secrets/rpc_creds)" != "$(cat /config/transmission-credentials.txt)" ]]; then
-    echo "Setting Transmission RPC credentials from docker secret..."
-    cp /run/secrets/rpc_creds /config/transmission-credentials.txt
-    export TRANSMISSION_RPC_USERNAME=$(head -1 /config/transmission-credentials.txt)
-    export TRANSMISSION_RPC_PASSWORD=$(tail -1 /config/transmission-credentials.txt)
-  fi
-else
-  echo "${TRANSMISSION_RPC_USERNAME}" > /config/transmission-credentials.txt
-  echo "${TRANSMISSION_RPC_PASSWORD}" >> /config/transmission-credentials.txt
+  export TRANSMISSION_RPC_USERNAME=$(head -1 /run/secrets/rpc_creds)
+  export TRANSMISSION_RPC_PASSWORD=$(tail -1 /run/secrets/rpc_creds)
 fi
+echo "${TRANSMISSION_RPC_USERNAME}" > /config/transmission-credentials.txt
+echo "${TRANSMISSION_RPC_PASSWORD}" >> /config/transmission-credentials.txt
 
 # Persist transmission settings for use by transmission-daemon
 export CONFIG="${CHOSEN_OPENVPN_CONFIG}"