From 443eeacf05d6131e8cf2c2cbfd4521cf351bbb77 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 19 Oct 2023 17:07:31 +0000 Subject: [PATCH 1/5] Auto-update README --- README.md | 4 ++-- README_fr.md | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4dad72e..49964ed 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,12 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -The fastest wiki and knowledge base for growing teams. Beautiful, feature rich, and markdown compatible. +Outline is a wiki and knowledge base for growing teams. Beautiful, feature rich, and markdown compatible. ### Features - Fully working installation of Outline wiki -- Including a Dex server to connect to Yunohost's LDAP userbase using an OIDC auth flow +- Including a Dex server to connect to YunoHost's LDAP userbase using an OIDC auth flow - Using Yunohost's built-in SMTP server for notifications diff --git a/README_fr.md b/README_fr.md index 5f43db6..76f7eef 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,14 +16,13 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -The fastest wiki and knowledge base for growing teams. Beautiful, feature rich, and markdown compatible. +Outile est un wiki et la base de connaissances les plus rapides pour les équipes en pleine croissance. Beau, riche en fonctionnalités et compatible avec les démarques. -### Features - -- Fully working installation of Outline wiki -- Including a Dex server to connect to Yunohost's LDAP userbase using an OIDC auth flow -- Using Yunohost's built-in SMTP server for notifications +### Caractéristiques +- Installation entièrement fonctionnelle du wiki Outline +- Y compris un serveur Dex pour se connecter à la base d'utilisateurs LDAP de YunoHost à l'aide d'un flux d'authentification OIDC +- Utilisation du serveur SMTP intégré de Yunohost pour les notifications **Version incluse :** 0.72.1.1~ynh1 From 7dee78f792c5fa91419c52d6282ee315344f8678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 19 Oct 2023 20:05:40 +0200 Subject: [PATCH 2/5] cleaning --- scripts/install | 4 +--- scripts/upgrade | 10 +--------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index 1952589..e908285 100755 --- a/scripts/install +++ b/scripts/install @@ -118,14 +118,12 @@ yunohost service add $app --description="Outline server" --log="/var/log/$app/$a #================================================= # BUILD YARN DEPENDENCIES #================================================= +ynh_script_progression --message="Building $app" --weight=18 pushd "$install_dir" ynh_use_nodejs -#REMOVEME? ynh_script_progression --message="Fetching Yarn production dependencies... This can be very long, be patient !" --weight=18 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --frozen-lockfile --network-timeout 1000000000 2>&1 - ynh_script_progression --message="Building... This can be very long, be patient !" --weight=18 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH NODE_OPTIONS="--max-old-space-size=3200" yarn build 2>&1 - ynh_script_progression --message="Cleaning cache... " --weight=3 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1 popd diff --git a/scripts/upgrade b/scripts/upgrade index 12cd69a..48ea078 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,11 +48,6 @@ if ynh_compare_current_package_version --comparison le --version 0.69.2.2~ynh1 then ynh_script_progression --message="Migrating MinIO data to local directory" -#REMOVEME? minio_domain=$(ynh_app_setting_get --app=$app --key=minio_domain) -#REMOVEME? minio_admin=$(ynh_app_setting_get --app=$app --key=minio_admin) -#REMOVEME? minio_password=$(ynh_app_setting_get --app=$app --key=minio_password) -#REMOVEME? mc_path=$(ynh_app_setting_get --app=$app --key=mc_path) - mkdir -p "/var/lib/$app/data" chown -R minio:www-data "/var/lib/$app" ynh_exec_warn_less sudo -u minio $mc_path/mc mirror --preserve "minio/outlinestorage" "/var/lib/$app/data" @@ -79,15 +74,12 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION #================================================= # UPGRADE YARN DEPENDENCIES #================================================= -#REMOVEME? ynh_script_progression --message="Building Yarn dependencies... This can be very long, be patient !" --weight=10 +ynh_script_progression --message="Building $app" --weight=10 pushd "$install_dir" ynh_use_nodejs -#REMOVEME? ynh_script_progression --message="Fetching Yarn production dependencies... This can be very long, be patient !" --weight=18 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --frozen-lockfile --network-timeout 1000000000 2>&1 - ynh_script_progression --message="Building... This can be very long, be patient !" --weight=18 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH NODE_OPTIONS="--max-old-space-size=3900" yarn build 2>&1 - ynh_script_progression --message="Cleaning cache... " --weight=3 ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1 popd From 13f47e1519d516d07ec326b4753589d80b9099fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 19 Oct 2023 20:06:03 +0200 Subject: [PATCH 3/5] Update tests.toml --- tests.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests.toml b/tests.toml index 43d573b..3d594c5 100644 --- a/tests.toml +++ b/tests.toml @@ -16,3 +16,9 @@ test_format = 1.0 args.dex_domain="dex.domain.tld" args.dex_path="/example" + + # ------------------------------- + # Commits to test upgrade from + # ------------------------------- + + test_upgrade_from.01d37841270a502d16767a9d7e4e19c8a85a5d06.name = "Upgrade from 0.69.2" From 265fb93581729672ba4ebc87adcb01b1198a40e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 19 Oct 2023 20:06:28 +0200 Subject: [PATCH 4/5] Update restore --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 7363cd6..6bfff6e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -77,8 +77,6 @@ yunohost service add $app --description="Outline server" --log="/var/log/$app/$a #================================================= # UPDATING A CONFIGURATION #================================================= - -#REMOVEME? ynh_secure_remove --file="$install_dir/.env" ynh_script_progression --message="Updating the configuration file..." --weight=1 ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" From 2f9d6104e99efb05aa421f167cb9d18baf8f53f7 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 20 Oct 2023 09:09:33 +0700 Subject: [PATCH 5/5] Update tests.toml --- tests.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests.toml b/tests.toml index 3d594c5..e00ad9d 100644 --- a/tests.toml +++ b/tests.toml @@ -8,6 +8,7 @@ test_format = 1.0 preinstall = """ sudo yunohost domain add dex.domain.tld + sudo yunohost domain add minio.domain.tld """ # ------------------------------- @@ -22,3 +23,7 @@ test_format = 1.0 # ------------------------------- test_upgrade_from.01d37841270a502d16767a9d7e4e19c8a85a5d06.name = "Upgrade from 0.69.2" + test_upgrade_from.01d37841270a502d16767a9d7e4e19c8a85a5d06.args.language = "en" + test_upgrade_from.01d37841270a502d16767a9d7e4e19c8a85a5d06.args.minio_domain = "minio.domain.tld" + test_upgrade_from.01d37841270a502d16767a9d7e4e19c8a85a5d06.args.minio_admin = "null" + test_upgrade_from.01d37841270a502d16767a9d7e4e19c8a85a5d06.args.minio_password = "null"