diff --git a/manifest.json b/manifest.json index 3a598ac..a68ce59 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)" @@ -74,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 } ] 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. diff --git a/scripts/install b/scripts/install index 775fd90..8915cb6 100755 --- a/scripts/install +++ b/scripts/install @@ -164,14 +164,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" diff --git a/scripts/upgrade b/scripts/upgrade index 20e4653..a4b820c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,16 +70,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 @@ -130,7 +130,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