From 4ee2f28c3396d5540548ea0b7cde49412c48d133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 29 Mar 2023 23:53:31 +0200
Subject: [PATCH] fix

---
 manifest.json | 61 ---------------------------------------------------
 manifest.toml | 22 +++++++------------
 tests.toml    |  3 +++
 3 files changed, 11 insertions(+), 75 deletions(-)
 delete mode 100644 manifest.json
 create mode 100644 tests.toml

diff --git a/manifest.json b/manifest.json
deleted file mode 100644
index 04982ab..0000000
--- a/manifest.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "name": "Movim",
-    "id": "movim",
-    "packaging_format": 1,
-    "description": {
-        "en": "Web-based cross-platform XMPP client",
-        "fr": "Client XMPP multiplateforme basé sur le Web"
-    },
-    "version": "0.20~ynh1",
-    "url": "https://movim.eu",
-    "upstream": {
-        "license": "AGPL-3.0-or-later",
-        "website": "https://movim.eu",
-        "demo": "https://nl.movim.eu/?login",
-        "admindoc": "https://github.com/movim/movim/wiki",
-        "code": "https://github.com/movim/movim",
-        "cpe": "cpe:2.3:a:movim:movim"
-    },
-    "license": "AGPL-3.0-or-later",
-    "maintainer": {
-        "name": "",
-        "email": ""
-    },
-    "requirements": {
-        "yunohost": ">= 11.0.9"
-    },
-    "multi_instance": false,
-    "services": [
-        "nginx",
-        "php8.0-fpm",
-        "postgresql",
-        "metronome"
-    ],
-    "arguments": {
-        "install": [
-            {
-                "name": "domain",
-                "type": "domain"
-            },
-            {
-                "name": "path",
-                "type": "path",
-                "example": "/movim",
-                "default": "/movim"
-            },
-            {
-                "name": "is_public",
-                "type": "boolean",
-                "default": true
-            },
-            {
-                "name": "admin",
-                "type": "user"
-            },
-            {
-                "name": "password",
-                "type": "password"
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/manifest.toml b/manifest.toml
index aad28ad..bdb16be 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Movim"
 description.en = "Web-based cross-platform XMPP client"
 description.fr = "Client XMPP multiplateforme basé sur le Web"
 
-version = "0.20~ynh1"
+version = "0.21~ynh1"
 
 maintainers = []
 
@@ -15,26 +15,22 @@ website = "https://movim.eu"
 demo = "https://nl.movim.eu/?login"
 admindoc = "https://github.com/movim/movim/wiki"
 code = "https://github.com/movim/movim"
-cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number)
-fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin.
 
 [integration]
-yunohost = ">= 11.0.9"
-architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"]
+yunohost = ">= 11.1.15"
+architectures = "all"
 multi_instance = false
-ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials.
-sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal.
-disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ...
-ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
-ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
+ldap = false
+sso = true
+disk = "50M"
+ram.build = "50M"
+ram.runtime = "50M"
 
 [install]
     [install.domain]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "domain"
 
     [install.path]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "path"
     default = "/movim"
 
@@ -43,11 +39,9 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen
     default = "visitors"
 
     [install.admin]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "user"
 
     [install.password]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "password"
 
 [resources]
diff --git a/tests.toml b/tests.toml
new file mode 100644
index 0000000..cbbeef1
--- /dev/null
+++ b/tests.toml
@@ -0,0 +1,3 @@
+test_format = 1.0
+
+[default]