diff --git a/README.md b/README.md index 4e5f662..94cffd5 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ DokuWiki is a simple to use and highly versatile Open Source wiki software that ## Documentation * Official documentation: https://www.dokuwiki.org/manual -* YunoHost documentation: https://yunohost.org/#/app_dokuwiki +* YunoHost documentation: https://yunohost.org/en/app_dokuwiki ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index 6626ce5..e75fbfb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ DokuWiki est un logiciel wiki Open Source simple à utiliser et très polyvalent ## Documentation * Documentation officielle : https://www.dokuwiki.org/manual -* Documentation YunoHost : https://yunohost.org/#/app_dokuwiki +* Documentation YunoHost : https://yunohost.org/fr/app_dokuwiki ## Caractéristiques spécifiques YunoHost diff --git a/check_process b/check_process index cf4781d..49a2a04 100644 --- a/check_process +++ b/check_process @@ -18,7 +18,6 @@ upgrade=1 from_commit=500a7d3fa9c008a2b75d0f6bec519e41fed97da0 backup_restore=1 multi_instance=1 - port_already_use=0 change_url=1 ;;; Options Email= diff --git a/manifest.json b/manifest.json index 2105583..db5e641 100644 --- a/manifest.json +++ b/manifest.json @@ -22,50 +22,34 @@ "email": "opi@zeropi.net" }], "requirements": { - "yunohost": ">= 4.1.2" + "yunohost": ">= 4.1.7" }, "multi_instance": true, "services": [ "nginx", - "php7.0-fpm" + "php7.3-fpm" ], "arguments": { "install" : [ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain for DokuWiki", - "fr": "Choisissez un domaine pour DokuWiki" - }, "example": "domain.org" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for DokuWiki", - "fr": "Choisissez un chemin pour DokuWiki" - }, "example": "/dokuwiki", "default": "/dokuwiki" }, { "name": "admin", "type": "user", - "ask": { - "en": "Choose an admin user", - "fr": "Choisissez l'administrateur" - }, "example": "johndoe" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public DokuWiki site?", - "fr": "Est-ce un site public ?" - }, "default": true }, { diff --git a/pull_request_template.md b/pull_request_template.md index 8f984e1..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,12 +11,6 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -- [ ] **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/dokuwiki_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/dokuwiki_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. +* 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/change_url b/scripts/change_url index fe9ea64..7b2adff 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -29,6 +29,23 @@ ynh_script_progression --message="Loading installation settings..." # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. + ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + + # Restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED #================================================= diff --git a/scripts/install b/scripts/install index 6314e1a..92731ae 100755 --- a/scripts/install +++ b/scripts/install @@ -224,9 +224,7 @@ ynh_script_progression --message="Configuring permissions..." --weight=2 # Make app public if necessary if [ $is_public -eq 1 ] then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 8db409e..34daf6f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -44,7 +44,6 @@ if [ -z "$language" ]; then ynh_app_setting_set --app=$app --key=language --value=$language fi - # Cleaning legacy permissions admin_user=$(ynh_app_setting_get --app=$app --key=admin)