flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-10-31 10:27:14 +00:00
Code Issues Releases Wiki Activity

Move ecparam and eckey generation into guest mode if (#291)

Browse Source 
move waiting for ecparam and eckey into the allow guest mode if as this is only required for the guest mode
This commit is contained in:
Felix Bartels 2019-11-22 08:19:44 +01:00 committed by GitHub
parent 3165430f72
commit 0130c9829f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
konnect/wrapper.sh
View File

@ -9,6 +9,8 @@ if [ $# -gt 0 ]; then
exit exit
fi fi
if [ "${allow_client_guests:-}" = "yes" ]; then
# TODO this should be simplified so that ecparam and eckey are only required if the is no jwk-meet.json yet
dockerize \ dockerize \
-wait file://"${ecparam:?}" \ -wait file://"${ecparam:?}" \
-wait file://"${eckey:?}" \ -wait file://"${eckey:?}" \
@ -21,11 +23,10 @@ if [ ! -s "$ecparam" ]; then
fi fi
if [ ! -s "$eckey" ]; then if [ ! -s "$eckey" ]; then
echo "Creating ec key for Meet..." echo "Creating ec private key for Meet..."
openssl ec -in "$ecparam" -out "$eckey" >/dev/null 2>&1 openssl ec -in "$ecparam" -out "$eckey" >/dev/null 2>&1
fi fi
if [ "${allow_client_guests:-}" = "yes" ]; then
echo "Patching identifier registration for use of the Meet guest mode" echo "Patching identifier registration for use of the Meet guest mode"
/usr/local/bin/konnectd utils jwk-from-pem --use sig "$eckey" > /tmp/jwk-meet.json /usr/local/bin/konnectd utils jwk-from-pem --use sig "$eckey" > /tmp/jwk-meet.json
CONFIG_JSON=/etc/kopano/konnectd-identifier-registration.yaml CONFIG_JSON=/etc/kopano/konnectd-identifier-registration.yaml