diff --git a/abra.sh b/abra.sh index f6ec561..6eba449 100644 --- a/abra.sh +++ b/abra.sh @@ -5,30 +5,28 @@ export NGINX_CONF_VERSION=v4 export MY_CNF_VERSION=v4 export ENTRYPOINT_VERSION=v3 -run_occ(){ +run_occ() { su -p www-data -s /bin/sh -c "/var/www/html/occ $@" } -post_install_occ(){ - IFS='|' read -ra CMD <<< "$OCC_CMDS" +post_install_occ() { + IFS='|' read -ra CMD <<<"$OCC_CMDS" for cmd in "${CMD[@]}"; do - run_occ "$cmd" + run_occ "$cmd" done } -install_apps(){ +install_apps() { install_apps="$@" - if [ -z "$install_apps" ] - then + if [ -z "$install_apps" ]; then install_apps=$APPS fi - for app in $install_apps - do + for app in $install_apps; do run_occ "app:install $app" done } -set_app_config(){ +set_app_config() { APP=$1 KEY=$2 VALUE=$3 @@ -56,22 +54,22 @@ install_bbb() { set_app_config bbb api.secret "$(cat /run/secrets/bbb_secret)" } -install_onlyoffice(){ +install_onlyoffice() { install_apps onlyoffice set_app_config onlyoffice DocumentServerUrl "$ONLYOFFICE_URL" set_app_config onlyoffice jwt_secret "$(cat /run/secrets/onlyoffice_jwt)" set_app_config onlyoffice customizationForcesave true } -set_default_quota(){ +set_default_quota() { set_app_config files default_quota "$DEFAULT_QUOTA" } -set_authentik(){ -install_apps sociallogin -AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret) -AUTHENTIK_ID=$(cat /run/secrets/authentik_id) -set_app_config sociallogin custom_providers " +set_authentik() { + install_apps sociallogin + AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret) + AUTHENTIK_ID=$(cat /run/secrets/authentik_id) + set_app_config sociallogin custom_providers " { \"custom_oidc\":[ { @@ -96,10 +94,10 @@ set_app_config sociallogin custom_providers " ] }" -set_app_config sociallogin update_profile_on_login 1 -set_app_config sociallogin auto_create_groups 1 -set_app_config sociallogin hide_default_login 1 -run_occ 'config:system:set social_login_auto_redirect --value true' -run_occ 'config:system:set allow_user_to_change_display_name --value=false' -run_occ 'config:system:set lost_password_link --value=disabled' + set_app_config sociallogin update_profile_on_login 1 + set_app_config sociallogin auto_create_groups 1 + set_app_config sociallogin hide_default_login 1 + run_occ 'config:system:set social_login_auto_redirect --value true' + run_occ 'config:system:set allow_user_to_change_display_name --value=false' + run_occ 'config:system:set lost_password_link --value=disabled' }