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

more cases for updating the identifier registration (#378)

Browse Source 
* update working copy on each step
This commit is contained in:
Felix Bartels 2020-04-03 11:12:01 +02:00 committed by GitHub
parent bf8a545e3e
commit 2eb025b86f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
konnect/wrapper.sh
View File

@ -46,11 +46,12 @@ if [ -f "${encryption_secret_key}" ] && [ ! -s "${encryption_secret_key}" ]; the
RANDFILE=/tmp/.rnd openssl rand -out "${encryption_secret_key}" 32
fi
# Create working copy by merging packaged example in /etc/kopano with passed registration conf
CONFIG_JSON=/tmp/konnectd-identifier-registration.yaml
yq -y -s '.[0] + .[1]' /etc/kopano/konnectd-identifier-registration.yaml "${identifier_registration_conf:?}" | sponge "$CONFIG_JSON"
if [ "${allow_client_guests:-}" = "yes" ]; then
# Create working copy by merging packaged example in /etc/kopano with passed registration conf
yq -y -s '.[0] + .[1]' /etc/kopano/konnectd-identifier-registration.yaml "${identifier_registration_conf:?}" | sponge "$CONFIG_JSON"
# only modify identifier registration if it does not already contain the right settings
if ! yq .clients[].id /kopano/ssl/konnectd-identifier-registration.yaml | grep -q "kpop-https://${FQDN%/*}/meet/"; then
@ -93,6 +94,9 @@ if [ "${allow_client_guests:-}" = "yes" ]; then
fi
if [ "${external_oidc_provider:-}" = "yes" ]; then
# Create working copy by merging packaged example in /etc/kopano with passed registration conf
yq -y -s '.[0] + .[1]' /etc/kopano/konnectd-identifier-registration.yaml "${identifier_registration_conf:?}" | sponge "$CONFIG_JSON"
echo "Patching identifier registration for external OIDC provider"
echo "authorities: [{name: ${external_oidc_name:-}, default: yes, iss: ${external_oidc_url:-}, client_id: kopano-meet, client_secret: ${external_oidc_clientsecret:-}, authority_type: oidc, response_type: id_token, scopes: [openid, profile, email]}]" >> /tmp/authority.yml
yq -y -s '.[0] + .[1]' $CONFIG_JSON /tmp/authority.yml | sponge "$identifier_registration_conf"