From f6f90072347577f95e29036dd0f156518fc6b818 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 27 Nov 2021 23:03:29 +0100
Subject: [PATCH] Upgrade to 2.0.0

---
 conf/app.src    |  4 ++--
 conf/nginx.conf |  4 ----
 manifest.json   | 14 ++++++--------
 scripts/restore |  5 +----
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 682b8a7..b4a6505 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/1.3.2/mobilizon-1.3.2.tar.gz
-SOURCE_SUM=74af9537ddd3ab4f549ee67e6e9b9b67946cf687c6f325b53947741348105e0a
+SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/2.0.0/mobilizon-2.0.0.tar.gz
+SOURCE_SUM=ffae1b57cca0278e10dcac3cc9c59d57366e6db0cd0c94655f9394594e6cd28d
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 6a4db4c..9c4dc93 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -19,10 +19,6 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 proxy_set_header X-Forwarded-Proto $scheme;
 
 location / {
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
 
   proxy_pass http://localhost:__PORT__;
 
diff --git a/manifest.json b/manifest.json
index fcdb787..a67f417 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,10 +3,10 @@
     "id": "mobilizon",
     "packaging_format": 1,
     "description": {
-        "en": "A decentralized and federated platform to organize events",
-        "fr": "Une plateforme décentralisée et fédérée pour organiser des événements"
+        "en": "Decentralized and federated platform to organize events",
+        "fr": "Plateforme décentralisée et fédérée pour organiser des événements"
     },
-    "version": "1.3.2~ynh1",
+    "version": "2.0.0~ynh1",
     "url": "https://joinmobilizon.org/",
     "upstream": {
         "license": "AGPL-3.0-or-later",
@@ -20,7 +20,7 @@
         "name": "yalh76"
     },
     "requirements": {
-        "yunohost": ">= 4.1.3"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
@@ -30,13 +30,11 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "admin",
-                "type": "user",
-                "example": "johndoe"
+                "type": "user"
             },
             {
                 "name": "is_public",
diff --git a/scripts/restore b/scripts/restore
index 61f45e7..a9e9f07 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -43,10 +43,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 #=================================================
 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 "
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS