From 3ab5c9b4a05e530593e02af720bf25c2e6bdda8a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Dec 2020 09:52:22 +0100 Subject: [PATCH] Add warning transition --- README.md | 2 ++ README_fr.md | 2 ++ check_process | 2 -- scripts/install | 6 ++---- scripts/restore | 4 ++-- scripts/upgrade | 12 +++++------- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index dafb6db..8efae42 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ [![Integration level](https://dash.yunohost.org/integration/codimd.svg)](https://dash.yunohost.org/appci/app/codimd) ![](https://ci-apps.yunohost.org/ci/badges/codimd.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/codimd.maintain.svg) [![Install CodiMD with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=codimd) +> :warning: The CodiMD project has been renamed HedgeDoc. The YunoHost package for HedgeDoc is now hosted at this address https://github.com/YunoHost-Apps/hedgedoc_ynh. codimd_ynh will stay at version 1.16 and will no longer be updated. + *[Lire ce readme en français.](./README_fr.md)* > *This package allows you to install CodiMD quickly and simply on a YunoHost server. diff --git a/README_fr.md b/README_fr.md index ab17d22..2a4c364 100644 --- a/README_fr.md +++ b/README_fr.md @@ -3,6 +3,8 @@ [![Niveau d'intégration](https://dash.yunohost.org/integration/codimd.svg)](https://dash.yunohost.org/appci/app/codimd) ![](https://ci-apps.yunohost.org/ci/badges/codimd.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/codimd.maintain.svg) [![Installer CodiMD avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=codimd) +> :warning: Le projet CodiMD a été renommé HedgeDoc. Le package YunoHost pour HedgeDoc est désormais hébergé à cette adresse https://github.com/YunoHost-Apps/hedgedoc_ynh. codimd_ynh restera à la version 1.16 et ne sera plus mis à jour. + *[Read this readme in english.](./README.md)* > *Ce package vous permet d'installer CodiMD rapidement et simplement sur un serveur YunoHost. diff --git a/check_process b/check_process index 8e2f879..7d6d5cf 100644 --- a/check_process +++ b/check_process @@ -16,8 +16,6 @@ multi_instance=1 port_already_use=1 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none \ No newline at end of file diff --git a/scripts/install b/scripts/install index 919d41a..68f34ec 100644 --- a/scripts/install +++ b/scripts/install @@ -121,11 +121,9 @@ ynh_system_user_create --username=$app --home_dir=$final_path ynh_script_progression --message="Building CodiMD... (this will take some time and resources!)" --weight=240 pushd "$final_path" || ynh_die - ynh_use_nodejs bin/setup ynh_exec_warn_less yarn run build - popd || ynh_die #================================================= @@ -180,7 +178,7 @@ chown -R $app:$app $final_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "Collaborative Markdown notes" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Collaborative Markdown notes" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE @@ -200,7 +198,7 @@ if [ $is_public -eq 1 ] then # Everyone can access the app. # The "main" permission is automatically created before the install script. - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission "main" --add "visitors" fi #================================================= diff --git a/scripts/restore b/scripts/restore index cd658be..f74fc22 100644 --- a/scripts/restore +++ b/scripts/restore @@ -106,14 +106,14 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name ynh_script_progression --message="Restoring the systemd configuration..." --weight=5 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "collaborative Markdown editor" --log "/var/log/$app/$app.log" +yunohost service add $app --description="collaborative Markdown editor" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index dd105ec..0278650 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -90,7 +90,7 @@ fi #================================================= ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -121,14 +121,12 @@ ynh_system_user_create --username=$app #============================================== if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Building CodiMD... (this will take some time and resources!)" --weight=160 + ynh_script_progression --message="Building CodiMD... (this will take some time and resources!)" --weight=36 pushd "$final_path" || ynh_die - ynh_use_nodejs bin/setup ynh_exec_warn_less yarn run build - popd || ynh_die fi @@ -169,7 +167,7 @@ ynh_add_systemd_config #================================================= # SECURE FILES AND DIRECTORIES #================================================= -ynh_script_progression --message="Securing files and directories..." +ynh_script_progression --message="Securing files and directories..." --weight=1 # Set permissions on app files chown -R $app:$app $final_path @@ -177,9 +175,9 @@ chown -R $app:$app $final_path #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "Collaborative Markdown notes" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Collaborative Markdown notes" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE