From 4878c76065b3eb22e2e013f258fe0353fa3455b9 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 27 Sep 2024 22:17:19 +0200 Subject: [PATCH 1/5] --- .env.sample | 7 +++++++ abra.sh | 26 +++++++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.env.sample b/.env.sample index 79dd4b8..de18254 100644 --- a/.env.sample +++ b/.env.sample @@ -44,6 +44,13 @@ DEFAULT_QUOTA="10 GB" # MAIL_DOMAIN= # SECRET_SMTP_PASSWORD_VERSION=v1 +## Customization +# THEMING_COLOR= +# THEMING_SLOGAN= +# COPY_ASSETS="flow_background.jpg|app:/var/www/html/themes/background.jpg" +# COPY_ASSETS="$COPY_ASSETS icon_left_brand.svg|app:/var/www/html/themes/logo.svg" +# COPY_ASSETS="$COPY_ASSETS icon.png|app:/web/dist/assets/icons/icon.png" + # APPS="calendar" # COLLABORA_URL=https://collabora.example.com diff --git a/abra.sh b/abra.sh index 3285a3f..ca88380 100644 --- a/abra.sh +++ b/abra.sh @@ -52,6 +52,27 @@ set_logfile_stdout() { set_system_config logfile '/dev/stdout' } +customize() { + if [ -z "$1" ] + then + echo "Usage: ... customize " + exit 1 + fi + asset_dir=$1 + for asset in $COPY_ASSETS; do + source=$(echo $asset | cut -d "|" -f1) + target=$(echo $asset | cut -d "|" -f2) + echo copy $source to $target + abra app cp $APP_NAME $asset_dir/$source $target + done + + abra app cmd -T $APP_NAME app set_app_config theming color \"$THEMING_COLOR\" + abra app cmd -T $APP_NAME app set_app_config theming slogan \"$THEMING_SLOGAN\" + abra app cmd -T $APP_NAME app run_occ "theming:config background \"/var/www/html/themes/flow_background.jpg\"" + abra app cmd -T $APP_NAME app run_occ "theming:config logo \"/var/www/html/themes/icon_left_brand.svg\"" + abra app cmd -T $APP_NAME app run_occ "theming:config logoheader \"/var/www/html/themes/icon.png\"" +} + install_bbb() { install_apps bbb set_app_config bbb app.navigation true @@ -121,8 +142,3 @@ set_authentik() { run_occ 'config:system:set allow_user_to_change_display_name --value=false' run_occ 'config:system:set lost_password_link --value=disabled' } - - -disable_skeletondirectory() { - run_occ "config:system:set skeletondirectory --value ''" -} -- 2.49.0 From 97dffc3d3eb7c4a4f3514f7d86f304640f73c1e5 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 30 Sep 2024 10:36:27 +0200 Subject: [PATCH 2/5] set logo url --- abra.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/abra.sh b/abra.sh index ca88380..0878f01 100644 --- a/abra.sh +++ b/abra.sh @@ -110,6 +110,7 @@ set_authentik() { install_apps sociallogin AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret) AUTHENTIK_ID=$(cat /run/secrets/authentik_id) + set_system_config logo_url \"https://$AUTHENTIK_DOMAIN\" set_app_config sociallogin custom_providers " { \"custom_oidc\":[ -- 2.49.0 From a537d0797fad989a200fee206213f69c83c1b43a Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 30 Sep 2024 14:07:38 +0200 Subject: [PATCH 3/5] fix function --- abra.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/abra.sh b/abra.sh index ca88380..c76f697 100644 --- a/abra.sh +++ b/abra.sh @@ -68,9 +68,9 @@ customize() { abra app cmd -T $APP_NAME app set_app_config theming color \"$THEMING_COLOR\" abra app cmd -T $APP_NAME app set_app_config theming slogan \"$THEMING_SLOGAN\" - abra app cmd -T $APP_NAME app run_occ "theming:config background \"/var/www/html/themes/flow_background.jpg\"" - abra app cmd -T $APP_NAME app run_occ "theming:config logo \"/var/www/html/themes/icon_left_brand.svg\"" - abra app cmd -T $APP_NAME app run_occ "theming:config logoheader \"/var/www/html/themes/icon.png\"" + abra app cmd -T $APP_NAME app run_occ 'theming:config background \"/var/www/html/themes/flow_background.jpg\"' + abra app cmd -T $APP_NAME app run_occ 'theming:config logo \"/var/www/html/themes/icon_left_brand.svg\"' + abra app cmd -T $APP_NAME app run_occ 'theming:config logoheader \"/var/www/html/themes/icon.png\"' } install_bbb() { @@ -110,6 +110,7 @@ set_authentik() { install_apps sociallogin AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret) AUTHENTIK_ID=$(cat /run/secrets/authentik_id) + set_system_config logo_url \"https://$AUTHENTIK_DOMAIN\" set_app_config sociallogin custom_providers " { \"custom_oidc\":[ -- 2.49.0 From a5bb4e92523a46246f3dc76a5ec97bd681cbc1b7 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 30 Sep 2024 14:10:40 +0200 Subject: [PATCH 4/5] fix function --- abra.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abra.sh b/abra.sh index c76f697..6771fde 100644 --- a/abra.sh +++ b/abra.sh @@ -68,9 +68,9 @@ customize() { abra app cmd -T $APP_NAME app set_app_config theming color \"$THEMING_COLOR\" abra app cmd -T $APP_NAME app set_app_config theming slogan \"$THEMING_SLOGAN\" - abra app cmd -T $APP_NAME app run_occ 'theming:config background \"/var/www/html/themes/flow_background.jpg\"' - abra app cmd -T $APP_NAME app run_occ 'theming:config logo \"/var/www/html/themes/icon_left_brand.svg\"' - abra app cmd -T $APP_NAME app run_occ 'theming:config logoheader \"/var/www/html/themes/icon.png\"' + abra app cmd -T $APP_NAME app run_occ '"theming:config background \"/var/www/html/themes/flow_background.jpg\""' + abra app cmd -T $APP_NAME app run_occ '"theming:config logo \"/var/www/html/themes/icon_left_brand.svg\""' + abra app cmd -T $APP_NAME app run_occ '"theming:config logoheader \"/var/www/html/themes/icon.png\""' } install_bbb() { -- 2.49.0 From 6b79ac67c1c2b688485329cc1ad0c49ab6e4b97e Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 30 Sep 2024 15:57:33 +0200 Subject: [PATCH 5/5] chore: publish 9.1.0+29.0.5-fpm release --- abra.sh | 6 +++++- compose.yml | 2 +- release/9.1.0+29.0.5-fpm | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 release/9.1.0+29.0.5-fpm diff --git a/abra.sh b/abra.sh index 6771fde..c81e04c 100644 --- a/abra.sh +++ b/abra.sh @@ -110,7 +110,7 @@ set_authentik() { install_apps sociallogin AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret) AUTHENTIK_ID=$(cat /run/secrets/authentik_id) - set_system_config logo_url \"https://$AUTHENTIK_DOMAIN\" + set_system_config logo_url https://$AUTHENTIK_DOMAIN set_app_config sociallogin custom_providers " { \"custom_oidc\":[ @@ -143,3 +143,7 @@ set_authentik() { run_occ 'config:system:set allow_user_to_change_display_name --value=false' run_occ 'config:system:set lost_password_link --value=disabled' } + +disable_skeletondirectory() { + run_occ "config:system:set skeletondirectory --value ''" +} diff --git a/compose.yml b/compose.yml index 1df6474..e3e0f9c 100644 --- a/compose.yml +++ b/compose.yml @@ -91,7 +91,7 @@ services: failure_action: rollback order: start-first labels: - - "coop-cloud.${STACK_NAME}.version=9.0.0+29.0.5-fpm" + - "coop-cloud.${STACK_NAME}.version=9.1.0+29.0.5-fpm" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "backupbot.backup=true" - "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/" diff --git a/release/9.1.0+29.0.5-fpm b/release/9.1.0+29.0.5-fpm new file mode 100644 index 0000000..1a56de8 --- /dev/null +++ b/release/9.1.0+29.0.5-fpm @@ -0,0 +1 @@ +Added automated customization options. Config needs to be updated to be able to use it. \ No newline at end of file -- 2.49.0