From 3a4c7b2ecef15226eff463533e7f15beac6919f9 Mon Sep 17 00:00:00 2001 From: janskiba Date: Wed, 26 Jul 2023 12:26:37 +0000 Subject: [PATCH 1/2] dont require beam enroll to run interactively --- bridgehead | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgehead b/bridgehead index 2709f8c..e69c282 100755 --- a/bridgehead +++ b/bridgehead @@ -120,7 +120,7 @@ case "$ACTION" in EMAIL_PARAM="--admin-email $SUPPORT_EMAIL" fi - docker run --rm -ti -v /etc/bridgehead/pki:/etc/bridgehead/pki samply/beam-enroll:latest --output-file $PRIVATEKEYFILENAME --proxy-id $MANUAL_PROXY_ID $EMAIL_PARAM + docker run --rm -v /etc/bridgehead/pki:/etc/bridgehead/pki samply/beam-enroll:latest --output-file $PRIVATEKEYFILENAME --proxy-id $MANUAL_PROXY_ID $EMAIL_PARAM chmod 600 $PRIVATEKEYFILENAME ;; preRun | preUpdate) From 6cfa7453855589d8719ec711127df929fae02703 Mon Sep 17 00:00:00 2001 From: janskiba Date: Thu, 17 Aug 2023 11:21:20 +0000 Subject: [PATCH 2/2] Remove -it from docker run --- lib/functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/functions.sh b/lib/functions.sh index ed0478e..97b75f8 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -188,7 +188,7 @@ function do_enroll_inner { PARAMS+="--admin-email $SUPPORT_EMAIL" fi - docker run --rm -ti -v /etc/bridgehead/pki:/etc/bridgehead/pki samply/beam-enroll:latest --output-file $PRIVATEKEYFILENAME --proxy-id $MANUAL_PROXY_ID $PARAMS + docker run --rm -v /etc/bridgehead/pki:/etc/bridgehead/pki samply/beam-enroll:latest --output-file $PRIVATEKEYFILENAME --proxy-id $MANUAL_PROXY_ID $PARAMS chmod 600 $PRIVATEKEYFILENAME } @@ -211,4 +211,4 @@ add_basic_auth_user() { fi log DEBUG "Saving clear text credentials in $FILE. If wanted, delete them manually." sed -i "/^$NAME/ s|$|\n# User: $USER\n# Password: $PASSWORD|" $FILE -} \ No newline at end of file +}