From 84555100547c739fdadc23930563ef49e88b8654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 1 Jan 2024 17:12:01 +0100
Subject: [PATCH] fix

---
 manifest.toml   | 15 +++++++++------
 scripts/install |  7 +------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index a071623..4cb9275 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,7 +19,7 @@ code = "https://github.com/apache/couchdb"
 cpe = "cpe:2.3:a:apache:couchdb"
 
 [integration]
-yunohost = ">= 11.1"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = false
 
@@ -63,8 +63,11 @@ ram.runtime = "60M"
     [resources.apt]
     packages = ["gnupg", "ca-certificates"]
 
-    # Find a way to do that here
-    # [resources.apt.extras.couchdb]
-    # repo = "deb https://apache.jfrog.io/artifactory/couchdb-deb/ $(lsb_release -c -s) main"
-    # key = "https://couchdb.apache.org/repo/keys.asc"
-    # packages = ["couchdb"]
+    [resources.apt]
+    packages = "deb1, deb2, php8.0-foo, php8.0-bar"
+
+    [resources.apt]
+    packages = ""
+    extras.couchdb.repo = "deb https://apache.jfrog.io/artifactory/couchdb-deb/ bullseye main"
+    extras.couchdb.key = "https://couchdb.apache.org/repo/keys.asc"
+    extras.couchdb.packages = ["couchdb"]
diff --git a/scripts/install b/scripts/install
index 706e974..905b890 100755
--- a/scripts/install
+++ b/scripts/install
@@ -36,18 +36,13 @@ couchdb couchdb/adminpass_again password $password
 couchdb couchdb/adminpass_again seen true" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive # apt-get install -y --force-yes couchdb
 
-ynh_install_extra_app_dependencies \
-    --repo="deb https://apache.jfrog.io/artifactory/couchdb-deb/ $(lsb_release -c -s) main" \
-    --key="https://couchdb.apache.org/repo/keys.asc" \
-    --package="couchdb"
-
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=2
 
 # Customize a bit the couch config
-ynh_add_config --template="../conf/couch_ynh.ini" --destination="$install_dir/etc/local.d/couch_ynh.ini"
+ynh_add_config --template="couch_ynh.ini" --destination="$install_dir/etc/local.d/couch_ynh.ini"
 
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"