Remove ask on manifest (#78)

* Remove ask on manifest

* Add ynh_abort_if_errors

Co-authored-by: Gofannon <17145502+Gofannon@users.noreply.github.com>

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
 

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
 

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=

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
             },
             {

pull_request_template.md

@@ -11,12 +11,6 @@
 - [ ] Upgrade from last version tested.
 - [ ] Can be reviewed and tested.
 
-## Validation
+## Package_check results
 ---
-- [ ] **Code review** : 
+* 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!"*
-- [ ] **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.

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
 #=================================================

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.
+	ynh_permission_update --permission="main" --add="visitors"
-	# The "main" permission is automatically created before the install script.
-	ynh_permission_update --permission "main" --add "visitors"
 fi
 
 #=================================================

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)