diff --git a/README_fr.md b/README_fr.md index 602b651..c3233c5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -67,6 +67,6 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour essayer la branche testing, procédez comme suit. ``` sudo yunohost app install https://github.com/YunoHost-Apps/encryptic_ynh/tree/testing --debug -or +ou sudo yunohost app upgrade encryptic -u https://github.com/YunoHost-Apps/encryptic_ynh/tree/testing --debug ``` diff --git a/manifest.json b/manifest.json index 09640e9..52d7715 100644 --- a/manifest.json +++ b/manifest.json @@ -4,13 +4,13 @@ "packaging_format": 1, "description": { "en": "Open-source note-taking application heavily focused on encryption.", - "fr": "Application de prise de notes open source axée sur le cryptage." + "fr": "Application de prise de notes open source axée sur le chiffrement." }, - "version": "0.1.0~ynh1", + "version": "0.1.0~ynh2", "url": "https://www.encryptic.org/", "license": "MPL-2.0", "maintainer": { - "name": "", + "name": "eric_G", "email": "" }, "requirements": { @@ -48,6 +48,10 @@ "en": "Is it a public application?", "fr": "Est-ce une application publique ?" }, + "help": { + "en": "If enabled, Encryptic 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, Encryptic 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 e207c97..8f91a2f 100755 --- a/scripts/install +++ b/scripts/install @@ -61,12 +61,20 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." --weight=1 + +# Create a system user +ynh_system_user_create --username=$app + #================================================= # SECURE FILES AND DIRECTORIES #================================================= # Set permissions to app files -chown -R root: $final_path +chown -R $app: $final_path #================================================= # SETUP SSOWAT diff --git a/scripts/remove b/scripts/remove index a7fdfb6..2379447 100755 --- a/scripts/remove +++ b/scripts/remove @@ -36,6 +36,14 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config +#================================================= +# REMOVE DEDICATED USER +#================================================= +ynh_script_progression --message="Removing the dedicated system user..." --weight=1 + +# Delete a system user +ynh_system_user_delete --username=$app + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index ae90655..0730dd8 100755 --- a/scripts/restore +++ b/scripts/restore @@ -63,7 +63,7 @@ ynh_system_user_create --username=$app #================================================= # Restore permissions on app files -chown -R root: $final_path +chown -R $app: $final_path #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 4decc37..3594e30 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -60,12 +60,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -86,12 +80,20 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." --weight=1 + +# Create a system user +ynh_system_user_create --username=$app + #================================================= # SECURE FILES AND DIRECTORIES #================================================= # Set permissions on app files -chown -R root: $final_path +chown -R $app: $final_path #================================================= # RELOAD NGINX