diff --git a/check_process b/check_process index e9d48a1..91d59fd 100644 --- a/check_process +++ b/check_process @@ -19,9 +19,6 @@ incorrect_path=0 port_already_use=1 change_url=1 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email= Notification=none diff --git a/manifest.json b/manifest.json index 673d76b..dbaca8d 100644 --- a/manifest.json +++ b/manifest.json @@ -58,6 +58,10 @@ "en": "Is it a public site?", "fr": "Est-ce un site publique ?" }, + "help": { + "en": "If enabled, CryptPad will be accessible by people who do not have an account. This can be changed later via the webadmin.", + "fr": "Si cette case est cochée, CryptPad sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + }, "default": true } ] diff --git a/scripts/install b/scripts/install index dfda1d5..07854a2 100644 --- a/scripts/install +++ b/scripts/install @@ -135,12 +135,10 @@ ynh_store_file_checksum "$final_path/config/config.js" ynh_script_progression --message="Building CryptPad... (this will take some time and resources!)" --weight=60 pushd "$final_path" || ynh_die - ynh_use_nodejs ynh_exec_warn_less yarn install --allow-root yarn global add bower bower install --allow-root - popd || ynh_die #================================================= @@ -151,12 +149,11 @@ ynh_script_progression --message="Securing files and directories..." --weight=1 chown -R $app:$app $final_path #================================================= -# INTEGRATE SERVICE IN ADMIN PANEL +# INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -# Ajoute le service au monitoring de Yunohost. -yunohost service add $app --log "/var/log/$app/$app.log" +yunohost service add $app --description="Zero Knowledge realtime collaborative editor" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/remove b/scripts/remove index 84d6a3f..8ae9496 100644 --- a/scripts/remove +++ b/scripts/remove @@ -26,7 +26,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # REMOVE SERVICE INTEGRATION IN YUNOHOST #================================================= -# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) +# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then ynh_script_progression --message="Removing CryptPad service..." --weight=3 diff --git a/scripts/restore b/scripts/restore index 0a435f9..cb631dc 100644 --- a/scripts/restore +++ b/scripts/restore @@ -89,13 +89,14 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 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..." --weight=1 -yunohost service add $app --description "Zero Knowledge realtime collaborative editor" --log "/var/log/$app/$app.log" +yunohost service add $app --description="Zero Knowledge realtime collaborative editor" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 7ebfc40..bad4cf5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -146,12 +146,10 @@ ynh_store_file_checksum "$final_path/config/config.js" ynh_script_progression --message="Building CryptPad... (this will take some time and resources!)" --weight=60 pushd "$final_path" || ynh_die - ynh_use_nodejs ynh_exec_warn_less yarn install --allow-root yarn global add bower bower install --allow-root - popd || ynh_die #================================================= @@ -175,6 +173,13 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 # Set permissions on app files chown -R $app:$app $final_path +#================================================= +# INTEGRATE SERVICE IN YUNOHOST +#================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 + +yunohost service add $app --description="Zero Knowledge realtime collaborative editor" --log="/var/log/$app/$app.log" + #================================================= # START SYSTEMD SERVICE #=================================================