From ed560b9fdcd2f0096bdc709913ddba79059f60f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 17 Apr 2021 13:28:01 +0200 Subject: [PATCH 1/4] Testing (#13) - Set permissions --- README.md | 4 ++-- README_fr.md | 4 ++-- scripts/install | 11 ++++++++++- scripts/remove | 8 ++++++++ scripts/restore | 19 ++++++++++--------- scripts/upgrade | 11 ++++++++++- 6 files changed, 42 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 2b7f9d4..ea2ec67 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ Clone of 2048 game with euro coins and bills. #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/20euros%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/20euros%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/20euros/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/20euros.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/20euros.svg)](https://ci-apps-arm.yunohost.org/ci/apps/20euros/) ## Links diff --git a/README_fr.md b/README_fr.md index c210f72..0ca084c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,8 +18,8 @@ Clone du jeu 2048 avec pièces et billets en euros. #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/20euros%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/20euros%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/20euros/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/20euros.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/20euros.svg)](https://ci-apps-arm.yunohost.org/ci/apps/20euros/) ## Liens diff --git a/scripts/install b/scripts/install index 024573c..1e56600 100755 --- a/scripts/install +++ b/scripts/install @@ -45,6 +45,14 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." --weight=2 + +# Create a system user +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # STANDARD MODIFICATIONS #================================================= @@ -73,7 +81,8 @@ ynh_add_nginx_config #================================================= # Set permissions to app files -chown -R root: $final_path +chown -R $app:www-data $final_path +chmod o-rwx $final_path #================================================= # SETUP SSOWAT diff --git a/scripts/remove b/scripts/remove index a660b98..f2c5329 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 c2896b5..e1ec9fc 100644 --- a/scripts/restore +++ b/scripts/restore @@ -44,6 +44,14 @@ test ! -d $final_path \ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# RECREATE THE DEDICATED USER +#================================================= +ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 + +# Create the dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -51,20 +59,13 @@ ynh_script_progression --message="Restoring $app main directory..." --weight=2 ynh_restore_file --origin_path="$final_path" -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app - #================================================= # RESTORE USER RIGHTS #================================================= # Restore permissions on app files -chown -R root: $final_path +chown -R $app:www-data $final_path +chmod o-rwx $final_path #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index cf43934..72500ca 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,6 +57,14 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 + +# Create a dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -83,7 +91,8 @@ ynh_add_nginx_config #================================================= # Set permissions on app files -chown -R root: $final_path +chown -R $app:www-data $final_path +chmod o-rwx $final_path #================================================= # RELOAD NGINX From ff3b47f2d262f4f8f1752eb10ee161b776edab3a Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Tue, 11 May 2021 07:23:19 +0200 Subject: [PATCH 2/4] [autopatch] Update issue and PR templates (#15) Co-authored-by: Yunohost-Bot <> --- pull_request_template.md | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 pull_request_template.md diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 6c28fc5..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how do you fix that problem* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* From b92684d72f2ea73b0523ceacbf90fc3e8e6ba425 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 4 Oct 2021 16:03:49 +0000 Subject: [PATCH 3/4] Auto-update README --- README.md | 43 ++++++++++++++++++++++++------------------- README_fr.md | 37 +++++++++++++++++++------------------ 2 files changed, 43 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index ea2ec67..51df577 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,40 @@ -# 20 Euros for YunoHost + + +# 20 euros for YunoHost [![Integration level](https://dash.yunohost.org/integration/20euros.svg)](https://dash.yunohost.org/appci/app/20euros) ![](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) -[![Install 20 Euros with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=20euros) +[![Install 20 euros with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=20euros) *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install 20 Euros quickly and simply on a YunoHost server. -If you don’t have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* +> *This package allows you to install 20 euros quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -Clone of 2048 game with euro coins and bills. +2048 variant with Euro coins and notes + +**Shipped version:** 1.0~ynh4 + + ## Screenshots -![](Screenshot-20euros.jpg) +![](./doc/screenshots/Screenshot-20euros.jpg) -#### Supported architectures +## Documentation and resources -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/20euros.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/20euros.svg)](https://ci-apps-arm.yunohost.org/ci/apps/20euros/) +* Official app website: https://github.com/jatekos101/20euros +* Upstream app code repository: https://github.com/jatekos101/20euros +* YunoHost documentation for this app: https://yunohost.org/app_20euros +* Report a bug: https://github.com/YunoHost-Apps/20euros_ynh/issues -## Links +## Developer info - * Report a bug: https://github.com/YunoHost-Apps/20euros_ynh/issues - * Upstream app repository: https://github.com/jatekos101/20euros - * YunoHost website: https://yunohost.org/ - ---- - -## Developers info - -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/20euros_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/20euros_ynh/tree/testing). To try the testing branch, please proceed like that. ``` @@ -39,3 +42,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/20euros_ynh/tree/test or sudo yunohost app upgrade 20euros -u https://github.com/YunoHost-Apps/20euros_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 0ca084c..64b4c2d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,33 +1,32 @@ -# 20 Euros pour YunoHost +# 20 euros pour YunoHost -[![Integration level](https://dash.yunohost.org/integration/20euros.svg)](https://dash.yunohost.org/appci/app/20euros) ![](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) -[![Installer 20 Euros avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=20euros) +[![Niveau d'intégration](https://dash.yunohost.org/integration/20euros.svg)](https://dash.yunohost.org/appci/app/20euros) ![](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) +[![Installer 20 euros avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=20euros) -*[Read this readme in english.](./README.md)* +*[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d’installer 20 Euros rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d'installer 20 euros rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* -## Vue d’ensemble +## Vue d'ensemble -Clone du jeu 2048 avec pièces et billets en euros. +Variante de 2048 avec pièces et billets en euros -## Captures d’écran +**Version incluse :** 1.0~ynh4 -![](Screenshot-20euros.jpg) -#### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/20euros.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/20euros.svg)](https://ci-apps-arm.yunohost.org/ci/apps/20euros/) +## Captures d'écran -## Liens +![](./doc/screenshots/Screenshot-20euros.jpg) - * Signaler un bug : https://github.com/YunoHost-Apps/20euros_ynh/issues - * Dépôt de l’application principale : https://github.com/jatekos101/20euros - * Site web YunoHost : https://yunohost.org/ +## Documentations et ressources ---- +* Site officiel de l'app : https://github.com/jatekos101/20euros +* Dépôt de code officiel de l'app : https://github.com/jatekos101/20euros +* Documentation YunoHost pour cette app : https://yunohost.org/app_20euros +* Signaler un bug : https://github.com/YunoHost-Apps/20euros_ynh/issues ## Informations pour les développeurs @@ -39,3 +38,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/20euros_ynh/tree/test ou sudo yunohost app upgrade 20euros -u https://github.com/YunoHost-Apps/20euros_ynh/tree/testing --debug ``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file From c7366152c148693d5d85e2a3f424c011c14a31a1 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 4 Oct 2021 16:04:58 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 2 ++ README_fr.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index d15c405..51df577 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in +## Screenshots + ![](./doc/screenshots/Screenshot-20euros.jpg) ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index be6ff55..64b4c2d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,6 +17,8 @@ Variante de 2048 avec pièces et billets en euros +## Captures d'écran + ![](./doc/screenshots/Screenshot-20euros.jpg) ## Documentations et ressources