From 2ad99d779cb40e1b1ca2872b7aed38aabcb28668 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 21 Apr 2021 23:36:29 +0200 Subject: [PATCH 1/3] Fix perm --- README.md | 4 ++-- README_fr.md | 4 ++-- pull_request_template.md | 4 +--- scripts/install | 4 +++- scripts/restore | 4 +++- scripts/upgrade | 4 +++- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 793c0a3..eea568d 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ WemaWema is a *WE MAKE PORN* meme generator, but it can do more. #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/wemawema%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/wemawema/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/wemawema%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/wemawema/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/wemawema.svg)](https://ci-apps.yunohost.org/ci/apps/wemawema/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/wemawema.svg)](https://ci-apps-arm.yunohost.org/ci/apps/wemawema/) ## Limitations diff --git a/README_fr.md b/README_fr.md index 0b54714..fcbf59d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,8 +35,8 @@ WemaWema est un générateur de mèmes *WE MAKE PORN*. #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/wemawema%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/wemawema/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/wemawema%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/wemawema/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/wemawema.svg)](https://ci-apps.yunohost.org/ci/apps/wemawema/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/wemawema.svg)](https://ci-apps-arm.yunohost.org/ci/apps/wemawema/) ## Limitations diff --git a/pull_request_template.md b/pull_request_template.md index 0b20ffd..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -13,6 +13,4 @@ ## Package_check results --- -*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* - -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/wemawema_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/wemawema_ynh%20PR-NUM-%20(USERNAME)/) +* 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!"* diff --git a/scripts/install b/scripts/install index bfaf8d2..a454443 100755 --- a/scripts/install +++ b/scripts/install @@ -71,7 +71,9 @@ ynh_add_nginx_config #================================================= # Set permissions to app files -chown -R www-data: $final_path +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R root: "$final_path" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index ec3cf4e..c6c686b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -56,7 +56,9 @@ ynh_restore_file --origin_path="$final_path" #================================================= # Restore permissions on app files -chown -R www-data: $final_path +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R root: "$final_path" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 91f795c..849575f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -86,7 +86,9 @@ ynh_add_nginx_config #================================================= # Set right permissions for curl installation -chown -R www-data: $final_path +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R root: "$final_path" #================================================= # RELOAD NGINX From 7d0bc36848ddbf82ee1fe1e8af53358e0936545d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 21 Apr 2021 23:45:51 +0200 Subject: [PATCH 2/3] Fix --- scripts/install | 1 - scripts/restore | 1 - scripts/upgrade | 1 - 3 files changed, 3 deletions(-) diff --git a/scripts/install b/scripts/install index a454443..cc95d1b 100755 --- a/scripts/install +++ b/scripts/install @@ -72,7 +72,6 @@ ynh_add_nginx_config # Set permissions to app files chmod 750 "$final_path" -chmod -R o-rwx "$final_path" chown -R root: "$final_path" #================================================= diff --git a/scripts/restore b/scripts/restore index c6c686b..6b4bb9b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -57,7 +57,6 @@ ynh_restore_file --origin_path="$final_path" # Restore permissions on app files chmod 750 "$final_path" -chmod -R o-rwx "$final_path" chown -R root: "$final_path" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 849575f..eb0a592 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -87,7 +87,6 @@ ynh_add_nginx_config # Set right permissions for curl installation chmod 750 "$final_path" -chmod -R o-rwx "$final_path" chown -R root: "$final_path" #================================================= From 770372c34ef26f37c6f71a086ebefab640ca3abd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 21 Apr 2021 23:52:56 +0200 Subject: [PATCH 3/3] Fix --- scripts/install | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index cc95d1b..fa08cab 100755 --- a/scripts/install +++ b/scripts/install @@ -71,8 +71,8 @@ ynh_add_nginx_config #================================================= # Set permissions to app files -chmod 750 "$final_path" -chown -R root: "$final_path" +chmod 750 $final_path +chown -R www-data: $final_path #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 6b4bb9b..f3eb1d7 100755 --- a/scripts/restore +++ b/scripts/restore @@ -56,8 +56,8 @@ ynh_restore_file --origin_path="$final_path" #================================================= # Restore permissions on app files -chmod 750 "$final_path" -chown -R root: "$final_path" +chmod 750 $final_path +chown -R www-data: $final_path #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index eb0a592..25b006b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -86,8 +86,8 @@ ynh_add_nginx_config #================================================= # Set right permissions for curl installation -chmod 750 "$final_path" -chown -R root: "$final_path" +chmod 750 $final_path +chown -R www-data: $final_path #================================================= # RELOAD NGINX