From a43b38008c3d28f548c6e12082153ff0303f4f42 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Wed, 12 Jun 2024 20:38:13 +0200
Subject: [PATCH] more tests + try multi_instance

---
 conf/.env        |  4 ++--
 conf/options.yml | 21 ---------------------
 manifest.toml    |  2 +-
 tests.toml       |  1 +
 4 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 conf/options.yml

diff --git a/conf/.env b/conf/.env
index 05b5350..ed31a4e 100644
--- a/conf/.env
+++ b/conf/.env
@@ -17,8 +17,8 @@ PHOTOPRISM_HTTP_PORT="__PORT__"
 
 PHOTOPRISM_DATABASE_DRIVER="MySQL"
 PHOTOPRISM_DATABASE_SERVER="127.0.0.1"
-PHOTOPRISM_DATABASE_NAME="photoprism"
-PHOTOPRISM_DATABASE_USER="photoprism"
+PHOTOPRISM_DATABASE_NAME="__DB_NAME__"
+PHOTOPRISM_DATABASE_USER="__DB_USER__"
 PHOTOPRISM_DATABASE_PASSWORD="__DB_PWD__"
 
 PHOTOPRISM_DEFAULT_THEME="lavendel"
diff --git a/conf/options.yml b/conf/options.yml
deleted file mode 100644
index 730b5cb..0000000
--- a/conf/options.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-Debug: false
-DarktableBin: /usr/bin/darktable-cli
-AssetsPath: /home/yunohost.app/__APP__/assets
-CachePath: /home/yunohost.app/__APP__/cache
-OriginalsPath: /home/yunohost.app/__APP__/photos/originals
-ImportPath: /home/yunohost.app/__APP__/photos/import
-TempPath: /home/yunohost.app/__APP__/temp
-SiteUrl: https://__DOMAIN____PATH__
-AdminPassword: __PASSWORD__
-HttpServerHost: 127.0.0.1
-HttpMode: release
-HttpPort: __PORT__
-HttpPassword:
-DatabaseDriver: MySQL
-DatabaseServer: 127.0.0.1
-DatabaseName: photoprism
-DatabaseUser: photoprism
-DatabasePassword: __DB_PWD__
-Theme: lavendel
-Language: __LANGUAGE_KEY__
-SiteDescription: __APP__
\ No newline at end of file
diff --git a/manifest.toml b/manifest.toml
index 05c7d2a..da22913 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -23,7 +23,7 @@ fund = "https://www.photoprism.app/membership"
 [integration]
 yunohost = ">= 12.0"
 architectures = ["amd64", "arm64", "armhf"]
-multi_instance = false
+multi_instance = true
 ldap = false
 sso = false
 disk = "50M"
diff --git a/tests.toml b/tests.toml
index 63cc1b8..da49ae4 100644
--- a/tests.toml
+++ b/tests.toml
@@ -5,3 +5,4 @@ test_format = 1.0
 [default]
 
 test_upgrade_from.fe71ba9.name = "Packaging v1"
+test_upgrade_from.678f0f9.name = "2022.09.01~ynh4"