From 50362b10d9108c064467470e2e85abf98226e49e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 5 Mar 2023 22:08:40 +0100
Subject: [PATCH] fix

---
 manifest.json | 55 ---------------------------------------------------
 manifest.toml | 21 ++++++++++----------
 2 files changed, 10 insertions(+), 66 deletions(-)
 delete mode 100644 manifest.json

diff --git a/manifest.json b/manifest.json
deleted file mode 100644
index 461d41f..0000000
--- a/manifest.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "name": "Lychee",
-    "id": "lychee",
-    "packaging_format": 1,
-    "description": {
-        "en": "Photo-management-system to manage and share photos",
-        "fr": "Système de gestion de photos pour gérer et partager des photos"
-    },
-    "version": "4.7.0~ynh1",
-    "url": "https://lycheeorg.github.io/",
-    "upstream": {
-        "license": "MIT",
-        "website": "https://lycheeorg.github.io/",
-        "demo": "https://lycheeorg.github.io/demo/",
-        "admindoc": "https://lycheeorg.github.io/docs/",
-        "code": "https://github.com/LycheeOrg/Lychee"
-    },
-    "license": "MIT",
-    "maintainer": {
-        "name": "eric_G",
-        "email": ""
-    },
-    "requirements": {
-        "yunohost": ">= 11.0.9"
-    },
-    "multi_instance": true,
-    "services": [
-        "nginx",
-        "php8.1-fpm",
-        "mysql"
-    ],
-    "arguments": {
-        "install": [
-            {
-                "name": "domain",
-                "type": "domain"
-            },
-            {
-                "name": "path",
-                "type": "path",
-                "example": "/lychee",
-                "default": "/lychee"
-            },
-            {
-                "name": "is_public",
-                "type": "boolean",
-                "help": {
-                    "en": "If enabled, Lychee will be accessible by people who do not have an account. This can be changed later via the webadmin.",
-                    "fr": "Si cette case est cochée, Lychee sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
-                },
-                "default": true
-            }
-        ]
-    }
-}
diff --git a/manifest.toml b/manifest.toml
index be44c64..5ad06be 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -15,26 +15,22 @@ website = "https://lycheeorg.github.io/"
 demo = "https://lycheeorg.github.io/demo/"
 admindoc = "https://lycheeorg.github.io/docs/"
 code = "https://github.com/LycheeOrg/Lychee"
-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.13"
+architectures = "all"
 multi_instance = true
-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 = false
+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 = "/lychee"
 
@@ -54,5 +50,8 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen
     [resources.permissions]
     main.url = "/"
 
+    [resources.apt]
+    packages = "ffmpeg php8.1-xml php8.1-imagick php8.1-bcmath php8.1-exif php8.1-mbstring php8.1-gd php8.1-mysqli php8.1-zip php8.1-intl"
+
     [resources.database]
     type = "mysql"