From 64a4c1b8e6a3a16a5fb71dc1acc422434c39ff17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <clement@selfhost.fr>
Date: Sun, 5 Mar 2017 17:17:14 +0100
Subject: [PATCH] switch to multi-instance

---
 manifest.json      | 4 ++--
 scripts/_common.sh | 5 +++++
 scripts/install    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 064e6d3..9261bc2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -15,7 +15,7 @@
     "requirements": {
         "yunohost": ">= 2.4.0"
     },
-    "multi_instance": false,
+    "multi_instance": true,
     "services": [
         "nginx",
         "php5-fpm",
@@ -45,7 +45,7 @@
             {
                 "name": "admin",
                 "type": "user",
-                "optional": true,
+                "optional": false,
                 "ask": {
                     "en": "Choose the default user (leave empty if none)",
                     "fr": "Choisissez l'utilisateur par defaut (laissez vide si aucun)"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 24d6046..b729181 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -36,3 +36,8 @@ extract_freshrss() {
     || ynh_die "Unable to extract FreshRss tarball"
   sudo rm "$rc_tarball"
 }
+
+install_freshrss_dependencies() {
+    ynh_package_install_from_equivs ../conf/${DEPS_PKG_NAME}.control \
+      || ynh_die "Unable to install dependencies"
+}
diff --git a/scripts/install b/scripts/install
index a635537..026601a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -11,7 +11,7 @@ domain=$1
 path=$2
 admin_user=$3
 # Setup variables
-app=$APPNAME
+app=$YNH_APP_INSTANCE_NAME
 db_user=$app
 db_name=$app