From 7abe57c55f1163d0c7840a18900ee3abd3711c60 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 21 Sep 2021 23:27:14 +0200
Subject: [PATCH] Cleaning up

---
 manifest.json   | 14 ++++++--------
 scripts/install |  2 +-
 scripts/restore |  2 --
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/manifest.json b/manifest.json
index 7e8f20a..b60d0a7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,9 +3,9 @@
     "id": "flarum",
     "packaging_format": 1,
     "description": {
-        "en": "Next-generation forum made simple.",
-        "fr": "Un forum de nouvelle génération, simplement.",
-        "de": "Forum der nächsten Generation leicht gemacht."
+        "en": "Next-generation forum made simple",
+        "fr": "Forum de nouvelle génération, simplement",
+        "de": "Forum der nächsten Generation leicht gemacht"
     },
     "version": "1.0.0~ynh5",
     "url": "http://flarum.org/",
@@ -27,7 +27,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.0-fpm",
+        "php7.3-fpm",
         "mysql"
     ],
     "arguments": {
@@ -42,8 +42,7 @@
             },
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "path",
@@ -53,8 +52,7 @@
             },
             {
                 "name": "admin",
-                "type": "user",
-                "example": "johndoe"
+                "type": "user"
             },
             {
                 "name": "password",
diff --git a/scripts/install b/scripts/install
index 7eb09f4..f7192ec 100644
--- a/scripts/install
+++ b/scripts/install
@@ -65,7 +65,7 @@ ynh_app_setting_set --app=$app --key=ldap_version --value=$ldap_version
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..."  --weight=2
+ynh_script_progression --message="Installing dependencies..." --weight=2
 
 ynh_install_app_dependencies $pkg_dependencies
 
diff --git a/scripts/restore b/scripts/restore
index 1a25a68..74aa201 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -40,8 +40,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..."
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
 test ! -d $final_path \
 	|| ynh_die --message="There is already a directory: $final_path "