From 0857806acf002b7b8615d7b977eadc6cfaec781e Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jandd@cacert.org>
Date: Fri, 27 Aug 2021 17:41:26 +0200
Subject: [PATCH] Make signer and signer_client work with minimal changes

---
 docker-compose.yml       | 4 +++-
 docker/run-signer        | 2 +-
 docker/run-signer_client | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 67cab0e..c84031f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -101,6 +101,7 @@ services:
     volumes:
       - certstaging:/srv/certs
       - signersockets:/srv/sockets
+      - webdbincl:/home/cacert/www/includes/
     depends_on:
       - db
       - smtp
@@ -126,4 +127,5 @@ volumes:
   maildir: { }
   certstaging: { }
   signersockets: { }
-  signerdata: { }
\ No newline at end of file
+  signerdata: { }
+  webdbincl: { }
diff --git a/docker/run-signer b/docker/run-signer
index c145ea5..01848f2 100755
--- a/docker/run-signer
+++ b/docker/run-signer
@@ -23,7 +23,7 @@ if [ ! -f /srv/ca/gpg/gpg_root_0/secring.gpg ]; then cp /srv/testca/gpg/gpg_root
 if [ ! -f /srv/ca/gpg/gpg_root_0/pubring.gpg ]; then cp /srv/testca/gpg/gpg_root_0/pubring.gpg /srv/ca/gpg/gpg_root_0/pubring.gpg; fi
 
 rm -f /srv/sockets/signer
-socat -d -d PTY,link=/dev/ttyUSB0 UNIX-LISTEN:/srv/sockets/signer 2>&1 &
+socat -d -d "PTY,link=${SERIAL_PORT}" UNIX-LISTEN:/srv/sockets/signer 2>&1 &
 sleep 1
 
 cd /srv/CommModule/
diff --git a/docker/run-signer_client b/docker/run-signer_client
index 7c19dae..e8fd99c 100755
--- a/docker/run-signer_client
+++ b/docker/run-signer_client
@@ -2,10 +2,12 @@
 
 set -eu
 
-socat -d -d UNIX:/srv/sockets/signer PTY,link=/dev/ttyS0 2>&1 &
+export SERIAL_PORT=/dev/ttyUSB0
+
+socat -d -d "UNIX:/srv/sockets/signer" "PTY,link=${SERIAL_PORT}" 2>&1 &
 sleep 1
 
-export SERIAL_PORT=/dev/ttyS0
+echo "<?php mysql_connect(\"${MYSQL_WEBDB_HOSTNAME}\", \"${MYSQL_WEBDB_USER}\", \"${MYSQL_WEBDB_PASSWORD}\");" > "/home/cacert/www/includes/mysql.php"
 
 cd /srv/CommModule/