From 8e1e3c6808a17b9717d7d0b2fb20bd584270972c Mon Sep 17 00:00:00 2001
From: status404 <temp@mailchuck.com>
Date: Fri, 13 Jan 2023 18:39:43 +0300
Subject: [PATCH] fix 'listen' address in Docker entrypoint

---
 docker/README.md     |  5 +++--
 docker/entrypoint.sh | 27 ++++++++++++++++++---------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index 9af2a67..76548a2 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -37,7 +37,7 @@ services:
         -----END PGP PRIVATE KEY BLOCK-----
 
     volumes:
-      - bitdeals-conf:/etc/dm
+      - dm:/etc/dm
     ports:
       - 4999:4999
       - 80:80
@@ -56,7 +56,7 @@ docker run -d \
   -e DM_LC_ALL=en_US.UTF-8 \
   -p 127.0.0.1:4999:4999 \
   -p 127.0.0.1:80:80 \
-  -v ./bitdeals-conf/:/etc/dm \
+  -v ./dm/:/etc/dm \
   bitdeals/apostol-dm
 ```
 
@@ -75,4 +75,5 @@ Container images are configured using parameters passed at runtime.
 |-e DM_PGP_PASSWORD=|User PGP key password.|
 |-e DM_WEBAUTH=|Enable web user interface authentication.|
 |-e DM_LC_ALL=|Set Deal Module locale.|
+|-e DM_ACCOUNT_URL=|Set Account_URL for a new account non-interactive registration. Format: http[s]://<host>[:<port>]|
 
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 738d42c..45c5050 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -28,7 +28,7 @@ sed -i -e "/\[main\]/,/\[/ s/.*user=.*/user=$UNAME/" \
 	-e "/\[server\]/,/\[/ s/.*port=.*/port=4999/" $DM_CONF_FILES
 
 ## Change dm Website config
-sed -i 's/dmHost:.*/dmHost: "http:\/\/127.0.0.1:4999",/' $DM_WEB_CONF_FILE
+sed -i 's/dmHost:.*/dmHost: "http:\/\/0.0.0.0:4999",/' $DM_WEB_CONF_FILE
 
 if [ "$DM_WEBAUTH" = 1 -o "$DM_WEBAUTH" = true ]; then
 	sed -i 's/confAuthorize:.*/confAuthorize: true,/' $DM_WEB_CONF_FILE
@@ -101,10 +101,13 @@ then
 	Name-Comment: ${DM_ACCOUNT_URL:-https://example-$RANDOM$RANDOM.com}
 	Expire-Date: 0
 EOF
-	echo
 	tput setaf 2
-	gpg -k --keyid-format long 2>/dev/null | tail -n5
-	gpg --armor --export-secret-keys --passphrase "$DM_PGP_PASSWORD" | tee "$PGP_SEC_FILE"
+	cat <<-EOF
+
+	$(gpg -k --keyid-format long 2>/dev/null | tail -n5)
+	$(gpg --armor --export-secret-keys --passphrase "$DM_PGP_PASSWORD" | tee "$PGP_SEC_FILE")
+
+EOF
 	tput sgr0
 	gpgconf --kill all
 else
@@ -152,11 +155,17 @@ then
 	sed -i "/\[module\]/,/\[/ s/^address=.*/address=$BITCOIN/" $DM_CONF_FILES
 
 	## Show bitcoin key
-	echo -e "\nPlease backup this\tBITCOIN KEY:"
-	echo -e "Private key (raw form):\t$PRIVKEY"
-	echo -e "Private key (WIF form):\t${B}$PRIVKEYWIF${N}"
-	echo -e "Public key:\t$PUBKEY"
-	echo -e "Bitcoin address:\t$BITCOIN\n"
+	cat <<-EOF
+
+	Please backup this	BITCOIN KEY:"
+	Private key (raw form):	$PRIVKEY"
+	Private key (WIF form):	${B}$PRIVKEYWIF${N}"
+	Public key:		$PUBKEY"
+	Bitcoin address:	$BITCOIN\n"
+
+EOF
+else
+	echo -e "NOTE: Your Bitcoin address: $_DM_BITCOIN"
 fi
 
 ## Run the daemon