From e3387394c6826ac3aaaa16dc0eddf1fbb723a8f3 Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:31:22 +0100 Subject: [PATCH 1/9] fix license --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index feeff13..58b27c1 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "version":"1.7.13~ynh1", "url": "https://www.webtrees.net", - "license": "GNU", + "license": " GPL-3.0-or-later", "maintainer": { "name": "Anmol Sharma", "email": "anmol@datamol.org" From af31c9dbcd08ab058bf1c3ba529d2a8c6cb2af3a Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:35:58 +0100 Subject: [PATCH 2/9] fix few mistake in manifest.json --- manifest.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.json b/manifest.json index 58b27c1..81f9ce4 100644 --- a/manifest.json +++ b/manifest.json @@ -45,6 +45,7 @@ }, { "name": "username", + "type": "string", "ask": { "en": "Choose an admin username (Not a LDAP User)", "fr": "Choisissez un nom d'utilisateur pour l'administrateur de Webtrees (ne doit pas être un utilisateur YunoHost existant)" @@ -53,6 +54,7 @@ }, { "name": "name", + "type": "string", "ask": { "en": "Name of the user (Not a LDAP User)", "fr": "Nom de cet utilisateur" @@ -61,6 +63,7 @@ }, { "name": "email", + "type": "string", "ask": { "en": "Admin email (All the new registration will be sent on this email)", "fr": "Adresse email de l'administrateur (Toutes les nouvelles inscriptions seront envoyées à cette adresse)" From 2c4c0b124806d5513f2e3c951ac4513f49d6ba0c Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:37:18 +0100 Subject: [PATCH 3/9] sudo is not necessary, script run as root --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 380364b..2eb3d59 100755 --- a/scripts/install +++ b/scripts/install @@ -140,7 +140,7 @@ ynh_replace_string "__dbpass__" "$db_pwd" "../conf/config.ini.php" ynh_replace_string "__dbname__" "$db_name" "../conf/config.ini.php" # Copy the config file to the final path -sudo cp ../conf/config.ini.php $final_path/data/. +cp ../conf/config.ini.php $final_path/data/. # Load initial SQL into the new database ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/webtrees.sql" @@ -195,7 +195,7 @@ ynh_add_fpm_config #================================================= chown -R $app: $final_path -sudo chmod -R 700 $final_path/data +chmod -R 700 $final_path/data #================================================= # STORE THE CONFIG FILE CHECKSUM From 9b6f9b14bcabc9796a0ef9066b60e85e384c41ff Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:38:47 +0100 Subject: [PATCH 4/9] sudo is not necessary, script run as root --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 290185b..544775f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,16 +72,16 @@ ynh_abort_if_errors ynh_print_info "Upgrading source files..." # Move old app dir -sudo mv ${final_path} ${final_path}.old +mv ${final_path} ${final_path}.old # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source "$final_path" # restore data -sudo cp -a ${final_path}.old/data ${final_path} +cp -a ${final_path}.old/data ${final_path} # delete temp directory -sudo rm -Rf ${final_path}.old +rm -Rf ${final_path}.old #================================================= # NGINX CONFIGURATION @@ -133,7 +133,7 @@ ynh_store_file_checksum "$final_path/data/config.ini.php" # Set permissions on app files chown -R $app: $final_path -sudo chmod -R 700 $final_path/data +chmod -R 700 $final_path/data #================================================= # SETUP SSOWAT From ac549bb7fdc6d2899d85f3b0be06951cc4d22d6a Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:41:23 +0100 Subject: [PATCH 5/9] fix typo --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 81f9ce4..151ac2d 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "version":"1.7.13~ynh1", "url": "https://www.webtrees.net", - "license": " GPL-3.0-or-later", + "license": "GPL-3.0-or-later", "maintainer": { "name": "Anmol Sharma", "email": "anmol@datamol.org" From 9e03083c629ab7155bce4e6bc970eba4b091c314 Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:42:11 +0100 Subject: [PATCH 6/9] sudo is not necessary, script run as root --- scripts/restore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 109ee4b..fd03e10 100644 --- a/scripts/restore +++ b/scripts/restore @@ -89,8 +89,8 @@ ynh_install_app_dependencies $pkg_dependencies # Restore permissions to app files -sudo chown -R $app: "${final_path}" -sudo chmod -R 700 $final_path/data +chown -R $app: "${final_path}" +chmod -R 700 $final_path/data #================================================= # RESTORE THE MYSQL DATABASE From 6891d7007434a7bb4a399370ee6a8b1b2268b226 Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:49:00 +0100 Subject: [PATCH 7/9] fix closing quotation error --- scripts/install | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 2eb3d59..7e5bfa3 100755 --- a/scripts/install +++ b/scripts/install @@ -232,14 +232,7 @@ systemctl reload nginx # SEND A README FOR THE ADMIN #================================================= -message=" $app was successfully installed :) - -Please open https://$domain$path_url - -The admin username is: $admin_username -And the admin password is: $password - -If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/Webtrees_ynh" +message=" $app was successfully installed :) \n Please open https://$domain$path_url \n The admin username is: $admin_username \n And the admin password is: $password \n If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/Webtrees_ynh" ynh_send_readme_to_admin "$message" From 7ac156179912aa4e2c00859c947e6e18ce69bdaf Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 18 Dec 2019 16:42:19 +0100 Subject: [PATCH 8/9] pull_request_template.md --- pull_request_template.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 pull_request_template.md diff --git a/pull_request_template.md b/pull_request_template.md new file mode 100644 index 0000000..2cef46f --- /dev/null +++ b/pull_request_template.md @@ -0,0 +1,22 @@ +## 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. + +## Validation +--- +- [ ] **Code review** : +- [ ] **Approval (LGTM)** : +*Code review and approval have to be from a member of @YunoHost-Apps/apps-group* +- **CI succeeded** : +[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/APP_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/APP_ynh%20PR-NUM-/) +*Please replace '-NUM-' in this link by the PR number.* +When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. From 6925e8ed5fc93e72b0fd87a4074af0ed73c87a70 Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 18 Dec 2019 16:44:42 +0100 Subject: [PATCH 9/9] fix help warning in package_check --- manifest.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest.json b/manifest.json index 151ac2d..9272bcf 100644 --- a/manifest.json +++ b/manifest.json @@ -77,6 +77,10 @@ "en": "Is it a public application?", "fr": "Est-ce une application publique ?" }, + "help": { + "en": "If checked, the app will be public", + "fr": "Si cochée, votre application sera publique" + }, "default": true } ]