From 3bfe6e463e5baaec29f6d0544e9f8a71280b6e2d Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sat, 14 Dec 2024 00:17:38 +0100
Subject: [PATCH 01/21] Upgrade sources - `main` v1.122.3:
 https://github.com/immich-app/immich/releases/tag/v1.122.3

---
 manifest.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 1dcd6dc..b532cb8 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -7,7 +7,7 @@ name = "Immich"
 description.en = "Photo and video backup solution directly from your mobile phone"
 description.fr = "Sauvegarde de photos et de vidéos directement depuis votre mobile"
 
-version = "1.122.2~ynh1"
+version = "1.122.3~ynh1"
 
 maintainers = ["ewilly"]
 
@@ -43,8 +43,8 @@ ram.runtime = "500M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/immich-app/immich/archive/refs/tags/v1.122.2.tar.gz"
-        sha256 = "28ee2adcfbe34ae72833f1078771fe1561415e450e1cd54a7a29d0cf57164d2e"
+        url = "https://github.com/immich-app/immich/archive/refs/tags/v1.122.3.tar.gz"
+        sha256 = "7f59cfd085953c0771e7cdb12f563d351a22697ed96daac50a840ca65558b220"
 
         autoupdate.strategy = "latest_github_release"
 

From 2502e0cd69522fccd1e197755512b0bcb71837ea Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sat, 14 Dec 2024 00:17:40 +0100
Subject: [PATCH 02/21] Auto-update READMEs

---
 README.md         | 2 +-
 README_es.md      | 2 +-
 README_eu.md      | 2 +-
 README_fr.md      | 2 +-
 README_gl.md      | 2 +-
 README_id.md      | 2 +-
 README_nl.md      | 2 +-
 README_pl.md      | 2 +-
 README_ru.md      | 2 +-
 README_zh_Hans.md | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index b98b8f2..ca86544 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Shipped version:** 1.122.2~ynh1
+**Shipped version:** 1.122.3~ynh1
 
 ## Screenshots
 
diff --git a/README_es.md b/README_es.md
index 2e157fc..9fc193d 100644
--- a/README_es.md
+++ b/README_es.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Versión actual:** 1.122.2~ynh1
+**Versión actual:** 1.122.3~ynh1
 
 ## Capturas
 
diff --git a/README_eu.md b/README_eu.md
index eac0a06..0a77502 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Paketatutako bertsioa:** 1.122.2~ynh1
+**Paketatutako bertsioa:** 1.122.3~ynh1
 
 ## Pantaila-argazkiak
 
diff --git a/README_fr.md b/README_fr.md
index 59a1949..5786c21 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -26,7 +26,7 @@ Solution d'autohébergement pour a gestion de vos photos et vidéos.
 - Interface conviviale et egronomique ;
 
 
-**Version incluse :** 1.122.2~ynh1
+**Version incluse :** 1.122.3~ynh1
 
 ## Captures d’écran
 
diff --git a/README_gl.md b/README_gl.md
index 228327b..0365c3d 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Versión proporcionada:** 1.122.2~ynh1
+**Versión proporcionada:** 1.122.3~ynh1
 
 ## Capturas de pantalla
 
diff --git a/README_id.md b/README_id.md
index 0c65065..adef198 100644
--- a/README_id.md
+++ b/README_id.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Versi terkirim:** 1.122.2~ynh1
+**Versi terkirim:** 1.122.3~ynh1
 
 ## Tangkapan Layar
 
diff --git a/README_nl.md b/README_nl.md
index f2b4bb3..063ae5d 100644
--- a/README_nl.md
+++ b/README_nl.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Geleverde versie:** 1.122.2~ynh1
+**Geleverde versie:** 1.122.3~ynh1
 
 ## Schermafdrukken
 
diff --git a/README_pl.md b/README_pl.md
index 430e28e..da46dcb 100644
--- a/README_pl.md
+++ b/README_pl.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Dostarczona wersja:** 1.122.2~ynh1
+**Dostarczona wersja:** 1.122.3~ynh1
 
 ## Zrzuty ekranu
 
diff --git a/README_ru.md b/README_ru.md
index 7ef1921..1da19aa 100644
--- a/README_ru.md
+++ b/README_ru.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Поставляемая версия:** 1.122.2~ynh1
+**Поставляемая версия:** 1.122.3~ynh1
 
 ## Снимки экрана
 
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index d730c62..668107b 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**分发版本：** 1.122.2~ynh1
+**分发版本：** 1.122.3~ynh1
 
 ## 截图
 

From 87ec17bde641393551098b60fc737791fc56a478 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Mon, 16 Dec 2024 21:30:05 +0100
Subject: [PATCH 03/21] Remove python building

---
 manifest.toml      |  26 +++-------
 scripts/_common.sh | 120 ++++++---------------------------------------
 scripts/install    |   9 ----
 scripts/restore    |   8 ---
 scripts/upgrade    |   9 ----
 5 files changed, 22 insertions(+), 150 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index b532cb8..a5dfd0e 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -7,7 +7,7 @@ name = "Immich"
 description.en = "Photo and video backup solution directly from your mobile phone"
 description.fr = "Sauvegarde de photos et de vidéos directement depuis votre mobile"
 
-version = "1.122.3~ynh1"
+version = "1.122.3~ynh2"
 
 maintainers = ["ewilly"]
 
@@ -19,7 +19,7 @@ userdoc = "https://github.com/immich-app/immich#getting-started"
 code = "https://github.com/immich-app/immich"
 
 [integration]
-yunohost = ">= 11.2.18"
+yunohost = ">= 12"
 helpers_version = "2.1"
 architectures = ["arm64", "amd64"]
 multi_instance = false
@@ -73,25 +73,13 @@ ram.runtime = "500M"
 
     [resources.apt]
     packages = [
+        "redis-server",
         "python3-venv",
         "python3-dev",
-        "ffmpeg",
-        "postgresql",
-        "wget",
-        "build-essential",
-        "libreadline-dev",
-        "libncursesw5-dev",
-        "libssl-dev",
-        "libsqlite3-dev",
-        "tk-dev",
-        "libgdbm-dev",
-        "libc6-dev",
-        "libbz2-dev",
-        "libffi-dev",
-        "zlib1g-dev",
-        "unzip",
         "uuid-runtime",
         "autoconf",
+        "build-essential",
+        "unzip",
         "jq",
         "perl",
         "libnet-ssleay-perl",
@@ -113,9 +101,7 @@ ram.runtime = "500M"
         "libmojolicious-perl",
         "libfile-slurper-perl",
         "liblcms2-2",
-        "libllvm16",
-        "libllvm13",
-        "redis-server"
+        "wget"
     ]
 
     [resources.apt.extras.postgresql]
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 903cb40..33690d7 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,6 +4,15 @@
 # COMMON VARIABLES AND CUSTOM HELPERS
 #=================================================
 
+# App version
+## yq is not a dependencie of yunohost package so tomlq command is not available
+## (see https://github.com/YunoHost/yunohost/blob/dev/debian/control)
+app_version()=$( \
+	cat ../manifest.toml 2>/dev/null \
+	| grep '^version = ' | cut -d '=' -f 2 \
+	| cut -d '~' -f 1 | tr -d ' "' \
+) #1.101.0
+
 # NodeJS required version
 nodejs_version=22
 
@@ -19,106 +28,11 @@ postgresql_cluster_port() {
 	pg_lsclusters --no-header | grep "^$postgresql_version" | cut -d' ' -f3
 }
 
-# Retrieve full latest python version from major version
-# usage: py_latest_from_major --python="3.8"
-# | arg: -p, --python=    - the major python version
-myynh_py_latest_from_major() {
-	# Declare an array to define the options of this helper.
-	local legacy_args=u
-	local -A args_array=( [p]=python= )
-	local python
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-
-	py_required_version=$(curl -Ls https://www.python.org/ftp/python/ \
-						| grep '>'$python  | cut -d '/' -f 2 \
-						| cut -d '>' -f 2 | sort -rV | head -n 1)
-}
-
-# Install specific python version
-# usage: myynh_install_python --python="3.8.6"
-# | arg: -p, --python=    - the python version to install
-myynh_install_python() {
-	# Declare an array to define the options of this helper.
-	local legacy_args=u
-	local -A args_array=( [p]=python= )
-	local python
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-
-	# Check python version from APT
-	local py_apt_version=$(python3 --version | cut -d ' ' -f 2)
-
-	# Usefull variables
-	local python_major=${python%.*}
-
-	# Check existing built version of python in /usr/local/bin
-	if [ -e "/usr/local/bin/python$python_major" ]
-	then
-		local py_built_version=$(/usr/local/bin/python$python_major --version \
-			| cut -d ' ' -f 2)
-	else
-		local py_built_version=0
-	fi
-
-	# Compare version
-	if $(dpkg --compare-versions $py_apt_version ge $python)
-	then
-		# APT >= Required
-		ynh_print_info "Using OS provided python3..."
-
-		py_app_version="python3"
-
-	else
-		# Either python already built or to build
-		if $(dpkg --compare-versions $py_built_version ge $python)
-		then
-			# Built >= Required
-			py_app_version="/usr/local/bin/python${py_built_version%.*}"
-
-			ynh_print_info "Using already python3 built version: $py_app_version"
-
-		else
-			# APT < Minimal & Actual < Minimal => Build & install Python into /usr/local/bin
-			ynh_print_info "Building python3 : $python (may take a while)..."
-
-			# Store current direcotry
-			local MY_DIR=$(pwd)
-
-			# Create a temp direcotry
-			tmpdir_py="$(mktemp --directory)"
-			cd "$tmpdir_py"
-
-			# Download
-			wget --output-document="Python-$python.tar.xz" \
-				"https://www.python.org/ftp/python/$python/Python-$python.tar.xz" 2>&1
-
-			# Extract
-			tar xf "Python-$python.tar.xz"
-
-			# Install
-			cd "Python-$python"
-			./configure --enable-optimizations
-			ynh_hide_warnings make -j4
-			ynh_hide_warnings make altinstall
-
-			# Go back to working directory
-			cd "$MY_DIR"
-
-			# Clean
-			ynh_safe_rm "$tmpdir_py"
-
-			# Set version
-			py_app_version="/usr/local/bin/python$python_major"
-		fi
-	fi
-	# Save python version in settings
-	ynh_app_setting_set --key=python --value="$python"
-
-	# Print some version information
-	ynh_print_info "Python version: $($py_app_version -VV)"
-	ynh_print_info "Pip version: $($py_app_version -m pip -V)"
-}
+# Python required version
+py_required_major=$( \
+	curl -Ls "https://raw.githubusercontent.com/immich-app/immich/refs/tags/v$app_version/machine-learning/Dockerfile "
+	| grep "FROM python:" | head -n1 | cut -d':' -f2 | cut -d'-' -f1 \
+) #3.11
 
 # Install immich
 myynh_install_immich() {
@@ -182,18 +96,17 @@ myynh_install_immich() {
 		cp -a "$source_dir/server/resources" "$install_dir/app/"
 		cp -a "$source_dir/server/package.json" "$install_dir/app/"
 		cp -a "$source_dir/server/package-lock.json" "$install_dir/app/"
-		#cp -a "$source_dir/server/start*.sh" "$install_dir/app/"
 		cp -a "$source_dir/LICENSE" "$install_dir/app/"
 		cp -a "$source_dir/i18n" "$install_dir/"
 		# Install custom start.sh script
-			ynh_config_add --template="$app-server-start.sh" --destination="$install_dir/app/start.sh"
+		ynh_config_add --template="$app-server-start.sh" --destination="$install_dir/app/start.sh"
 		cd "$install_dir/app/"
 		ynh_hide_warnings npm cache clean --force
 
 	# Install immich-machine-learning
 		cd "$source_dir/machine-learning"
 		mkdir -p "$install_dir/app/machine-learning"
-		$py_app_version -m venv "$install_dir/app/machine-learning/venv"
+		python3 -m venv "$install_dir/app/machine-learning/venv"
 		(
 			# activate the virtual environment
 			set +o nounset
@@ -207,7 +120,6 @@ myynh_install_immich() {
 			ynh_hide_warnings "$install_dir/app/machine-learning/venv/bin/poetry" install --no-root --with dev --with cpu
 		)
 		cp -a "$source_dir/machine-learning/ann" "$install_dir/app/machine-learning/"
-		#cp -a "$source_dir/machine-learning/start.sh" "$install_dir/app/machine-learning/"
 		cp -a "$source_dir/machine-learning/log_conf.json" "$install_dir/app/machine-learning/"
 		cp -a "$source_dir/machine-learning/gunicorn_conf.py" "$install_dir/app/machine-learning/"
  		cp -a "$source_dir/machine-learning/app" "$install_dir/app/machine-learning/"
diff --git a/scripts/install b/scripts/install
index 4552dfb..6ba7911 100755
--- a/scripts/install
+++ b/scripts/install
@@ -14,15 +14,6 @@ ynh_setup_source --source_id="main" --dest_dir="$source_dir"
 ffmpeg_static_dir="$install_dir/ffmpeg-static"
 ynh_setup_source --source_id="ffmpeg-static" --dest_dir="$ffmpeg_static_dir"
 
-#=================================================
-# CHECK PYTHON VERSION AND COMPILE IF NEEDED
-#=================================================
-ynh_script_progression "Check Python version & compile the required one if needed..."
-
-py_required_major=$(cat "$source_dir/machine-learning/Dockerfile" | grep "FROM python:" | head -n1 | cut -d':' -f2 | cut -d'-' -f1)
-myynh_py_latest_from_major --python="$py_required_major"
-myynh_install_python --python="$py_required_version"
-
 #=================================================
 # INSTALL NODEJS
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 0d0059c..c9c01ea 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -17,14 +17,6 @@ ynh_script_progression "Restoring the data directory..."
 
 ynh_restore "$data_dir"
 
-#=================================================
-# CHECK PYTHON VERSION AND COMPILE IF NEEDED
-#=================================================
-ynh_script_progression "Check Python version & compile the required one if needed..."
-
-py_required_version=$(ynh_app_setting_get --key=python)
-myynh_install_python --python="$py_required_version"
-
 #=================================================
 # INSTALL NODEJS
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 23835b7..24ff017 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -42,15 +42,6 @@ ynh_setup_source --source_id="main" --dest_dir="$source_dir" --full_replace
 ffmpeg_static_dir="$install_dir/ffmpeg-static"
 ynh_setup_source --source_id="ffmpeg-static" --dest_dir="$ffmpeg_static_dir" --full_replace
 
-#=================================================
-# CHECK PYTHON VERSION AND COMPILE IF NEEDED
-#=================================================
-ynh_script_progression "Check Python version & compile the required one if needed..."
-
-py_required_major=$(cat "$source_dir/machine-learning/Dockerfile" | grep "FROM python:" | head -n1 | cut -d':' -f2 | cut -d'-' -f1)
-myynh_py_latest_from_major --python="$py_required_major"
-myynh_install_python --python="$py_required_version"
-
 #=================================================
 # INSTALL NODEJS
 #=================================================

From 01fde1c3d3a47b459fdbd3b88234738afce97244 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Mon, 16 Dec 2024 21:28:43 +0100
Subject: [PATCH 04/21] Auto-update READMEs

---
 README.md         | 2 +-
 README_es.md      | 2 +-
 README_eu.md      | 2 +-
 README_fr.md      | 2 +-
 README_gl.md      | 2 +-
 README_id.md      | 2 +-
 README_nl.md      | 2 +-
 README_pl.md      | 2 +-
 README_ru.md      | 2 +-
 README_zh_Hans.md | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index ca86544..1476059 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Shipped version:** 1.122.3~ynh1
+**Shipped version:** 1.122.3~ynh2
 
 ## Screenshots
 
diff --git a/README_es.md b/README_es.md
index 9fc193d..1edcea2 100644
--- a/README_es.md
+++ b/README_es.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Versión actual:** 1.122.3~ynh1
+**Versión actual:** 1.122.3~ynh2
 
 ## Capturas
 
diff --git a/README_eu.md b/README_eu.md
index 0a77502..f726c90 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Paketatutako bertsioa:** 1.122.3~ynh1
+**Paketatutako bertsioa:** 1.122.3~ynh2
 
 ## Pantaila-argazkiak
 
diff --git a/README_fr.md b/README_fr.md
index 5786c21..551a087 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -26,7 +26,7 @@ Solution d'autohébergement pour a gestion de vos photos et vidéos.
 - Interface conviviale et egronomique ;
 
 
-**Version incluse :** 1.122.3~ynh1
+**Version incluse :** 1.122.3~ynh2
 
 ## Captures d’écran
 
diff --git a/README_gl.md b/README_gl.md
index 0365c3d..c5a75ac 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Versión proporcionada:** 1.122.3~ynh1
+**Versión proporcionada:** 1.122.3~ynh2
 
 ## Capturas de pantalla
 
diff --git a/README_id.md b/README_id.md
index adef198..4a67700 100644
--- a/README_id.md
+++ b/README_id.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Versi terkirim:** 1.122.3~ynh1
+**Versi terkirim:** 1.122.3~ynh2
 
 ## Tangkapan Layar
 
diff --git a/README_nl.md b/README_nl.md
index 063ae5d..c760f62 100644
--- a/README_nl.md
+++ b/README_nl.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Geleverde versie:** 1.122.3~ynh1
+**Geleverde versie:** 1.122.3~ynh2
 
 ## Schermafdrukken
 
diff --git a/README_pl.md b/README_pl.md
index da46dcb..1e65618 100644
--- a/README_pl.md
+++ b/README_pl.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Dostarczona wersja:** 1.122.3~ynh1
+**Dostarczona wersja:** 1.122.3~ynh2
 
 ## Zrzuty ekranu
 
diff --git a/README_ru.md b/README_ru.md
index 1da19aa..b2dd11c 100644
--- a/README_ru.md
+++ b/README_ru.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Поставляемая версия:** 1.122.3~ynh1
+**Поставляемая версия:** 1.122.3~ynh2
 
 ## Снимки экрана
 
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index 668107b..d4138e9 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**分发版本：** 1.122.3~ynh1
+**分发版本：** 1.122.3~ynh2
 
 ## 截图
 

From d493d22c64ffc9ffc4d4820b7d793a3b614f7ee9 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Mon, 16 Dec 2024 22:12:28 +0100
Subject: [PATCH 05/21] Fix

---
 scripts/_common.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 33690d7..e3f8341 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,7 +7,7 @@
 # App version
 ## yq is not a dependencie of yunohost package so tomlq command is not available
 ## (see https://github.com/YunoHost/yunohost/blob/dev/debian/control)
-app_version()=$( \
+app_version=$( \
 	cat ../manifest.toml 2>/dev/null \
 	| grep '^version = ' | cut -d '=' -f 2 \
 	| cut -d '~' -f 1 | tr -d ' "' \
@@ -20,13 +20,13 @@ nodejs_version=22
 failregex="$app-server.*Failed login attempt for user.+from ip address\s?<ADDR>"
 
 # PostgreSQL required version
-postgresql_version() {
+postgresql_version=$( \
 	ynh_read_manifest "resources.apt.extras.postgresql.packages" \
 	| grep -o 'postgresql-[0-9][0-9]-pgvector' | head -n1 | cut -d'-' -f2
-}
-postgresql_cluster_port() {
+)
+postgresql_cluster_port=$( \
 	pg_lsclusters --no-header | grep "^$postgresql_version" | cut -d' ' -f3
-}
+)
 
 # Python required version
 py_required_major=$( \

From b0738c8627312874a48cf131446dc388c5a106be Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Mon, 16 Dec 2024 22:40:23 +0100
Subject: [PATCH 06/21] Fix

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index e3f8341..bf499b0 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -30,7 +30,7 @@ postgresql_cluster_port=$( \
 
 # Python required version
 py_required_major=$( \
-	curl -Ls "https://raw.githubusercontent.com/immich-app/immich/refs/tags/v$app_version/machine-learning/Dockerfile "
+	curl -Ls "https://raw.githubusercontent.com/immich-app/immich/refs/tags/v$app_version/machine-learning/Dockerfile " \
 	| grep "FROM python:" | head -n1 | cut -d':' -f2 | cut -d'-' -f1 \
 ) #3.11
 

From 6b471ebdf8aa9f64bc800b5824f443d8c88d482c Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 08:23:46 +0100
Subject: [PATCH 07/21] Fix

---
 scripts/_common.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index bf499b0..5dee85f 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,9 +8,8 @@
 ## yq is not a dependencie of yunohost package so tomlq command is not available
 ## (see https://github.com/YunoHost/yunohost/blob/dev/debian/control)
 app_version=$( \
-	cat ../manifest.toml 2>/dev/null \
-	| grep '^version = ' | cut -d '=' -f 2 \
-	| cut -d '~' -f 1 | tr -d ' "' \
+	ynh_read_manifest "version" |
+	| cut -d'~' -f1 \
 ) #1.101.0
 
 # NodeJS required version
@@ -22,16 +21,23 @@ failregex="$app-server.*Failed login attempt for user.+from ip address\s?<ADDR>"
 # PostgreSQL required version
 postgresql_version=$( \
 	ynh_read_manifest "resources.apt.extras.postgresql.packages" \
-	| grep -o 'postgresql-[0-9][0-9]-pgvector' | head -n1 | cut -d'-' -f2
+	| grep -o 'postgresql-[0-9][0-9]-pgvector' \
+	| head -n1 \
+	| cut -d'-' -f2 \
 )
 postgresql_cluster_port=$( \
-	pg_lsclusters --no-header | grep "^$postgresql_version" | cut -d' ' -f3
+	pg_lsclusters --no-header \
+	| grep "^$postgresql_version" \
+	| cut -d' ' -f3 \
 )
 
 # Python required version
 py_required_major=$( \
 	curl -Ls "https://raw.githubusercontent.com/immich-app/immich/refs/tags/v$app_version/machine-learning/Dockerfile " \
-	| grep "FROM python:" | head -n1 | cut -d':' -f2 | cut -d'-' -f1 \
+	| grep "FROM python:" \
+	| head -n1 \
+	| cut -d':' -f2 \
+	| cut -d'-' -f1 \
 ) #3.11
 
 # Install immich

From 68f682100f5c52017802f75ac23ad5ff9757f6a7 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 08:27:10 +0100
Subject: [PATCH 08/21] Fix

---
 scripts/_common.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 5dee85f..cb35c75 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source /usr/share/yunohost/helpers
+
 #=================================================
 # COMMON VARIABLES AND CUSTOM HELPERS
 #=================================================

From 8184c60d553de11f7b9022ccf316788fa58050c7 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 08:28:26 +0100
Subject: [PATCH 09/21] Fix

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index cb35c75..d2376a7 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -10,7 +10,7 @@ source /usr/share/yunohost/helpers
 ## yq is not a dependencie of yunohost package so tomlq command is not available
 ## (see https://github.com/YunoHost/yunohost/blob/dev/debian/control)
 app_version=$( \
-	ynh_read_manifest "version" |
+	ynh_read_manifest "version" \
 	| cut -d'~' -f1 \
 ) #1.101.0
 

From ab3bb8fe5cbe8c4a9300fa70556681539a45eccf Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 08:30:37 +0100
Subject: [PATCH 10/21] Fix

---
 scripts/config | 99 --------------------------------------------------
 1 file changed, 99 deletions(-)
 delete mode 100644 scripts/config

diff --git a/scripts/config b/scripts/config
deleted file mode 100644
index 48be2ff..0000000
--- a/scripts/config
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-# In simple cases, you don't need a config script.
-
-# With a simple config_panel.toml, you can write in the app settings, in the
-# upstream config file or replace complete files (logo ...) and restart services.
-
-# The config scripts allows you to go further, to handle specific cases
-# (validation of several interdependent fields, specific getter/setter for a value,
-# display dynamic informations or choices, pre-loading of config type .cube... ).
-
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-source /usr/share/yunohost/helpers
-
-ynh_abort_if_errors
-
-#=================================================
-# RETRIEVE ARGUMENTS
-#=================================================
-
-install_dir=$(ynh_app_setting_get --app="$app" --key=install_dir)
-
-#=================================================
-# SPECIFIC GETTERS FOR TOML SHORT KEY
-#=================================================
-
-get__amount() {
-    # Here we can imagine to have an API call to stripe to know the amount of donation during a month
-    local amount=200
-
-    # It's possible to change some properties of the question by overriding it:
-    if [ "$amount" -gt 100 ]; then
-    cat << EOF
-style: success
-value: $amount
-ask:
-  en: A lot of donation this month: **$amount €**
-EOF
-    else
-    cat << EOF
-style: danger
-value: $amount
-ask:
-  en: Not so much donation this month: $amount €
-EOF
-    fi
-}
-
-get__prices() {
-    local prices
-    prices="$(grep "DONATION\['" "$install_dir/settings.py" | sed -r "s@^DONATION\['([^']*)'\]\['([^']*)'\] = '([^']*)'@\1/\2/\3@g" | sed -z 's/\n/,/g;s/,$/\n/')"
-    if [ "$prices" == "," ]; then
-        # Return YNH_NULL if you prefer to not return a value at all.
-        echo YNH_NULL
-    else
-        echo "$prices"
-    fi
-}
-
-
-#=================================================
-# SPECIFIC VALIDATORS FOR TOML SHORT KEYS
-#=================================================
-validate__publishable_key() {
-
-    # We can imagine here we test if the key is really a publishable key
-    (is_secret_key "$publishable_key") &&
-        echo 'This key seems to be a secret key'
-}
-
-#=================================================
-# SPECIFIC SETTERS FOR TOML SHORT KEYS
-#=================================================
-set__prices() {
-
-    #---------------------------------------------
-    # IMPORTANT: setters are triggered only if a change is detected
-    #---------------------------------------------
-    for price in $(echo "$prices" | sed "s/,/ /"); do
-        frequency=$(echo "$price" | cut -d/ -f1)
-        currency=$(echo "$price" | cut -d/ -f2)
-        price_id=$(echo "$price" | cut -d/ -f3)
-        sed "d/DONATION\['$frequency'\]\['$currency'\]" "$install_dir/settings.py"
-
-        echo "DONATION['$frequency']['$currency'] = '$price_id'" >> "$install_dir/settings.py"
-    done
-
-    #---------------------------------------------
-    # IMPORTANT: to be able to upgrade properly, you have to save the value in settings too
-    #---------------------------------------------
-    ynh_app_setting_set --app="$app" --key=prices --value="$prices"
-}
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-ynh_app_config_run "$1"

From cb7f8851149c2ed81c97173a7c341412ed99ed13 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 20:27:54 +0100
Subject: [PATCH 11/21] Fix

---
 scripts/_common.sh | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index d2376a7..c173c51 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source /usr/share/yunohost/helpers
-
 #=================================================
 # COMMON VARIABLES AND CUSTOM HELPERS
 #=================================================
@@ -9,10 +7,10 @@ source /usr/share/yunohost/helpers
 # App version
 ## yq is not a dependencie of yunohost package so tomlq command is not available
 ## (see https://github.com/YunoHost/yunohost/blob/dev/debian/control)
-app_version=$( \
+app_version() { \
 	ynh_read_manifest "version" \
 	| cut -d'~' -f1 \
-) #1.101.0
+} #1.101.0
 
 # NodeJS required version
 nodejs_version=22
@@ -21,26 +19,26 @@ nodejs_version=22
 failregex="$app-server.*Failed login attempt for user.+from ip address\s?<ADDR>"
 
 # PostgreSQL required version
-postgresql_version=$( \
+postgresql_version() { \
 	ynh_read_manifest "resources.apt.extras.postgresql.packages" \
 	| grep -o 'postgresql-[0-9][0-9]-pgvector' \
 	| head -n1 \
 	| cut -d'-' -f2 \
-)
-postgresql_cluster_port=$( \
+}
+postgresql_cluster_port() { \
 	pg_lsclusters --no-header \
 	| grep "^$postgresql_version" \
 	| cut -d' ' -f3 \
-)
+}
 
 # Python required version
-py_required_major=$( \
+py_required_major() { \
 	curl -Ls "https://raw.githubusercontent.com/immich-app/immich/refs/tags/v$app_version/machine-learning/Dockerfile " \
 	| grep "FROM python:" \
 	| head -n1 \
 	| cut -d':' -f2 \
 	| cut -d'-' -f1 \
-) #3.11
+} #3.11
 
 # Install immich
 myynh_install_immich() {

From f95250fb138fe20b966abbbd2e140343a7c88ee3 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 20:46:25 +0100
Subject: [PATCH 12/21] Fix

---
 scripts/_common.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index c173c51..0207bb3 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -9,7 +9,7 @@
 ## (see https://github.com/YunoHost/yunohost/blob/dev/debian/control)
 app_version() { \
 	ynh_read_manifest "version" \
-	| cut -d'~' -f1 \
+	| cut -d'~' -f1
 } #1.101.0
 
 # NodeJS required version
@@ -23,12 +23,12 @@ postgresql_version() { \
 	ynh_read_manifest "resources.apt.extras.postgresql.packages" \
 	| grep -o 'postgresql-[0-9][0-9]-pgvector' \
 	| head -n1 \
-	| cut -d'-' -f2 \
+	| cut -d'-' -f2
 }
 postgresql_cluster_port() { \
 	pg_lsclusters --no-header \
 	| grep "^$postgresql_version" \
-	| cut -d' ' -f3 \
+	| cut -d' ' -f3
 }
 
 # Python required version
@@ -37,7 +37,7 @@ py_required_major() { \
 	| grep "FROM python:" \
 	| head -n1 \
 	| cut -d':' -f2 \
-	| cut -d'-' -f1 \
+	| cut -d'-' -f1
 } #3.11
 
 # Install immich

From 7386f379221344e3c61a285cc1515be8e83ea9c6 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 20:48:48 +0100
Subject: [PATCH 13/21] Fix

---
 scripts/_common.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 0207bb3..619f44d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,7 +7,7 @@
 # App version
 ## yq is not a dependencie of yunohost package so tomlq command is not available
 ## (see https://github.com/YunoHost/yunohost/blob/dev/debian/control)
-app_version() { \
+app_version() {
 	ynh_read_manifest "version" \
 	| cut -d'~' -f1
 } #1.101.0
@@ -19,20 +19,20 @@ nodejs_version=22
 failregex="$app-server.*Failed login attempt for user.+from ip address\s?<ADDR>"
 
 # PostgreSQL required version
-postgresql_version() { \
+postgresql_version() {
 	ynh_read_manifest "resources.apt.extras.postgresql.packages" \
 	| grep -o 'postgresql-[0-9][0-9]-pgvector' \
 	| head -n1 \
 	| cut -d'-' -f2
 }
-postgresql_cluster_port() { \
+postgresql_cluster_port() {
 	pg_lsclusters --no-header \
 	| grep "^$postgresql_version" \
 	| cut -d' ' -f3
 }
 
 # Python required version
-py_required_major() { \
+py_required_major() {
 	curl -Ls "https://raw.githubusercontent.com/immich-app/immich/refs/tags/v$app_version/machine-learning/Dockerfile " \
 	| grep "FROM python:" \
 	| head -n1 \

From 435cc5971d998e0c407c830e90135f97d6d7dbd8 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 21:11:21 +0100
Subject: [PATCH 14/21] Fix

---
 manifest.toml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index a5dfd0e..704ebb4 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -115,6 +115,5 @@ ram.runtime = "500M"
         "postgresql-client-16"
     ]
 
-    # Commented to avoid provisionning a db on wrong cluster
-    #[resources.database]
-    #type = "postgresql"
+    [resources.database]
+    type = "postgresql"

From d82f2cc2520685d6209cef584b7be0a0ee3adff8 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 21:41:05 +0100
Subject: [PATCH 15/21] Fix

---
 scripts/_common.sh | 98 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 76 insertions(+), 22 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 619f44d..c334f82 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -19,15 +19,25 @@ nodejs_version=22
 failregex="$app-server.*Failed login attempt for user.+from ip address\s?<ADDR>"
 
 # PostgreSQL required version
-postgresql_version() {
+
+	default_psql_version=$(pg_lsclusters --no-header | grep "$default_port" | cut -d' ' -f1)
+	default_psql_cluster=$(pg_lsclusters --no-header | grep "$default_port" | cut -d' ' -f2)
+	default_psql_database=$(pg_lsclusters --no-header | grep "$default_port" | cut -d' ' -f5)
+
+app_psql_version() {
 	ynh_read_manifest "resources.apt.extras.postgresql.packages" \
 	| grep -o 'postgresql-[0-9][0-9]-pgvector' \
 	| head -n1 \
 	| cut -d'-' -f2
 }
-postgresql_cluster_port() {
+app_psql_cluster() {
+	pg_lsclusters --no-header \
+	| grep "^$app_psql_version" \
+	| cut -d' ' -f2
+}
+app_psql_port() {
 	pg_lsclusters --no-header \
-	| grep "^$postgresql_version" \
+	| grep "^$app_psql_version" \
 	| cut -d' ' -f3
 }
 
@@ -160,12 +170,14 @@ myynh_install_immich() {
 
 # Execute a psql command as root user
 # usage: myynh_execute_psql_as_root --sql=sql [--database=database]
+# | arg: -c, --cluster=     - the cluster to connect to
 # | arg: -s, --sql=         - the SQL command to execute
 # | arg: -d, --database=    - the database to connect to
 myynh_execute_psql_as_root() {
 	# Declare an array to define the options of this helper.
 	local legacy_args=sd
-	local -A args_array=([s]=sql= [d]=database=)
+	local -A args_array=([c]=cluster= [s]=sql= [d]=database=)
+	local cluster
 	local sql
 	local database
 	# Manage arguments with getopts
@@ -178,45 +190,79 @@ myynh_execute_psql_as_root() {
 	fi
 
 	LC_ALL=C sudo --login --user=postgres PGUSER=postgres PGPASSWORD="$(cat $PSQL_ROOT_PWD_FILE)" \
-		psql --cluster="$(postgresql_version)/main" "$database" --command="$sql"
+		psql --cluster="$cluster" "$database" --command="$sql"
 }
 
 # Install the database
 myynh_create_psql_db() {
-	myynh_execute_psql_as_root --sql="CREATE DATABASE $app;"
-	myynh_execute_psql_as_root --sql="CREATE USER $app WITH ENCRYPTED PASSWORD '$db_pwd';" --database="$app"
-	myynh_execute_psql_as_root --sql="GRANT ALL PRIVILEGES ON DATABASE $app TO $app;" --database="$app"
-	myynh_execute_psql_as_root --sql="ALTER USER $app WITH SUPERUSER;" --database="$app"
-	myynh_execute_psql_as_root --sql="CREATE EXTENSION IF NOT EXISTS vector;" --database="$app"
+	myynh_execute_psql_as_root \
+		--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+		--sql="CREATE DATABASE $app;"
+	myynh_execute_psql_as_root \
+		--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+		--sql="CREATE USER $app WITH ENCRYPTED PASSWORD '$db_pwd';" \
+		--database="$app"
+	myynh_execute_psql_as_root \
+		--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+		--sql="GRANT ALL PRIVILEGES ON DATABASE $app TO $app;" \
+		--database="$app"
+	myynh_execute_psql_as_root \
+		--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+		--sql="ALTER USER $app WITH SUPERUSER;" \
+		--database="$app"
+	myynh_execute_psql_as_root \
+		--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+		--sql="CREATE EXTENSION IF NOT EXISTS vector;" \
+		--database="$app"
 }
 
 # Update the database
 myynh_update_psql_db() {
-	databases=$(myynh_execute_psql_as_root --sql="SELECT datname FROM pg_database WHERE datistemplate = false OR datname = 'template1';" --database="postgres")
+	databases=$(myynh_execute_psql_as_root \
+				--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+				--sql="SELECT datname FROM pg_database WHERE datistemplate = false OR datname = 'template1';" \
+				--database="postgres")
 
 	for db in $databases
 	do
-		if ynh_hide_warnings myynh_execute_psql_as_root --sql=";" --database="$db" \
-		   | grep -q "collation version mismatch"
+		if ynh_hide_warnings myynh_execute_psql_as_root \
+			--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+			--sql=";" \
+			--database="$db" \
+			| grep -q "collation version mismatch"
 		then
-			ynh_hide_warnings myynh_execute_psql_as_root --sql="REINDEX DATABASE $db;" --database="$db"
-			myynh_execute_psql_as_root --sql="ALTER DATABASE $db REFRESH COLLATION VERSION;" --database="$db"
+			ynh_hide_warnings myynh_execute_psql_as_root \
+				--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+				--sql="REINDEX DATABASE $db;" \
+				--database="$db"
+			myynh_execute_psql_as_root \
+				--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+				--sql="ALTER DATABASE $db REFRESH COLLATION VERSION;" \
+				--database="$db"
 		fi
 	done
 }
 
 # Remove the database
 myynh_drop_psql_db() {
-	myynh_execute_psql_as_root --sql="REVOKE CONNECT ON DATABASE $app FROM public;"
-	myynh_execute_psql_as_root --sql="SELECT pg_terminate_backend (pg_stat_activity.pid) FROM pg_stat_activity \
-										WHERE pg_stat_activity.datname = '$app' AND pid <> pg_backend_pid();"
-	myynh_execute_psql_as_root --sql="DROP DATABASE $app;"
-	myynh_execute_psql_as_root --sql="DROP USER $app;"
+	myynh_execute_psql_as_root \
+		--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+		--sql="REVOKE CONNECT ON DATABASE $app FROM public;"
+	myynh_execute_psql_as_root \
+		--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+		--sql="SELECT pg_terminate_backend (pg_stat_activity.pid) FROM pg_stat_activity \
+				WHERE pg_stat_activity.datname = '$app' AND pid <> pg_backend_pid();"
+	myynh_execute_psql_as_root \
+		--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+		--sql="DROP DATABASE $app;"
+	myynh_execute_psql_as_root \
+		--cluster="$(app_psql_version)/$(app_psql_cluster)" \
+		--sql="DROP USER $app;"
 }
 
 # Dump the database
 myynh_dump_psql_db() {
-	sudo --login --user=postgres pg_dump --cluster="$(postgresql_version)/main" --dbname="$app" > db.sql
+	sudo --login --user=postgres pg_dump --cluster="$(app_psql_version)/$(app_psql_cluster)" --dbname="$app" > db.sql
 }
 
 # Restore the database
@@ -226,7 +272,7 @@ myynh_restore_psql_db() {
 		--replace="SELECT pg_catalog.set_config('search_path', 'public, pg_catalog', true);" --file="db.sql"
 
 	sudo --login --user=postgres PGUSER=postgres PGPASSWORD="$(cat $PSQL_ROOT_PWD_FILE)" \
-		psql --cluster="$(postgresql_version)/main" --dbname="$app" < ./db.sql
+		psql --cluster="$(app_psql_version)/$(app_psql_cluster)" --dbname="$app" < ./db.sql
 }
 
 
@@ -261,4 +307,12 @@ myynh_set_default_psql_cluster_to_debian_default() {
 
 	# Add new line USER  GROUP   VERSION CLUSTER DATABASE
 	echo -e "* * $default_psql_version $default_psql_cluster $default_psql_database" >> "$config_file"
+
+	# Delete provisionned immich db & user
+	myynh_execute_psql_as_root \
+		--cluster="$default_psql_version/$default_psql_cluster" \
+		--sql="DROP DATABASE $app;"
+	myynh_execute_psql_as_root \
+		--cluster="$default_psql_version/$default_psql_cluster" \
+		--sql="DROP USER $app;"
 }

From c6c2247c6784e42a8f1b8189cb3d17d65945a458 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 21:46:53 +0100
Subject: [PATCH 16/21] Fix

---
 scripts/_common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index c334f82..46bc847 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -32,12 +32,12 @@ app_psql_version() {
 }
 app_psql_cluster() {
 	pg_lsclusters --no-header \
-	| grep "^$app_psql_version" \
+	| grep "^$(app_psql_version)" \
 	| cut -d' ' -f2
 }
 app_psql_port() {
 	pg_lsclusters --no-header \
-	| grep "^$app_psql_version" \
+	| grep "^$(app_psql_version)" \
 	| cut -d' ' -f3
 }
 

From 30b1b125cd80e3fdf280047de9967c48c56239ff Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 21:58:50 +0100
Subject: [PATCH 17/21] Fix

---
 scripts/_common.sh | 24 ++++++++++++++++--------
 scripts/install    |  2 ++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 46bc847..4a9755e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -293,6 +293,22 @@ myynh_set_permissions() {
 	chmod u=rw,g=r,o= "/var/log/$app"
 }
 
+myynh_drop_provisionned_psql_db() {
+	local default_port=5432
+
+	#retrieve informations about default psql cluster
+	default_psql_version=$(pg_lsclusters --no-header | grep "$default_port" | cut -d' ' -f1)
+	default_psql_cluster=$(pg_lsclusters --no-header | grep "$default_port" | cut -d' ' -f2)
+
+	# Delete provisionned immich db & user
+	myynh_execute_psql_as_root \
+		--cluster="$default_psql_version/$default_psql_cluster" \
+		--sql="DROP DATABASE $app;"
+	myynh_execute_psql_as_root \
+		--cluster="$default_psql_version/$default_psql_cluster" \
+		--sql="DROP USER $app;"
+}
+
 myynh_set_default_psql_cluster_to_debian_default() {
 	local default_port=5432
 	local config_file="/etc/postgresql-common/user_clusters"
@@ -307,12 +323,4 @@ myynh_set_default_psql_cluster_to_debian_default() {
 
 	# Add new line USER  GROUP   VERSION CLUSTER DATABASE
 	echo -e "* * $default_psql_version $default_psql_cluster $default_psql_database" >> "$config_file"
-
-	# Delete provisionned immich db & user
-	myynh_execute_psql_as_root \
-		--cluster="$default_psql_version/$default_psql_cluster" \
-		--sql="DROP DATABASE $app;"
-	myynh_execute_psql_as_root \
-		--cluster="$default_psql_version/$default_psql_cluster" \
-		--sql="DROP USER $app;"
 }
diff --git a/scripts/install b/scripts/install
index 6ba7911..ae05341 100755
--- a/scripts/install
+++ b/scripts/install
@@ -26,6 +26,8 @@ ynh_nodejs_install
 #=================================================
 ynh_script_progression "Creating a PostgreSQL database..."
 
+myynh_drop_provisionned_psql_db
+
 db_pwd=$(ynh_string_random)
 myynh_update_psql_db
 myynh_create_psql_db

From c6b39079f8c65a9928688572b8f20f9485fa93b6 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 23:32:45 +0100
Subject: [PATCH 18/21] Fix

---
 scripts/_common.sh | 2 +-
 scripts/install    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 4a9755e..c4b87c4 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -190,7 +190,7 @@ myynh_execute_psql_as_root() {
 	fi
 
 	LC_ALL=C sudo --login --user=postgres PGUSER=postgres PGPASSWORD="$(cat $PSQL_ROOT_PWD_FILE)" \
-		psql --cluster="$cluster" "$database" --command="$sql"
+		psql --cluster="$(app_psql_version)/$(app_psql_cluster)" "$database" --command="$sql"
 }
 
 # Install the database
diff --git a/scripts/install b/scripts/install
index ae05341..df1623e 100755
--- a/scripts/install
+++ b/scripts/install
@@ -33,7 +33,7 @@ myynh_update_psql_db
 myynh_create_psql_db
 db_port=$(myynh_execute_psql_as_root --sql="\conninfo" | awk -F '"' '{ print $(NF-1) }')
 ynh_app_setting_set --key=psql_pwd --value="$db_pwd"
-ynh_app_setting_set --key=psql_version --value="$(postgresql_version)"
+ynh_app_setting_set --key=psql_version --value="$(app_psql_version)/$(app_psql_cluster)"
 ynh_app_setting_set --key=psql_port --value="$db_port"
 
 myynh_set_default_psql_cluster_to_debian_default

From ee2fb3bed0cc2fb36ebd099c3be8349248571991 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Tue, 17 Dec 2024 23:48:27 +0100
Subject: [PATCH 19/21] Fix

---
 manifest.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifest.toml b/manifest.toml
index 704ebb4..f0ddf8b 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -73,6 +73,7 @@ ram.runtime = "500M"
 
     [resources.apt]
     packages = [
+        "postgresql",
         "redis-server",
         "python3-venv",
         "python3-dev",

From ec6547ddecc72f415f2ecf840630da0b05fbe5de Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 18 Dec 2024 00:09:23 +0100
Subject: [PATCH 20/21] Upgrade sources - `main` v1.123.0:
 https://github.com/immich-app/immich/releases/tag/v1.123.0

---
 manifest.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index f0ddf8b..1fdfc72 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -7,7 +7,7 @@ name = "Immich"
 description.en = "Photo and video backup solution directly from your mobile phone"
 description.fr = "Sauvegarde de photos et de vidéos directement depuis votre mobile"
 
-version = "1.122.3~ynh2"
+version = "1.123.0~ynh1"
 
 maintainers = ["ewilly"]
 
@@ -43,8 +43,8 @@ ram.runtime = "500M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/immich-app/immich/archive/refs/tags/v1.122.3.tar.gz"
-        sha256 = "7f59cfd085953c0771e7cdb12f563d351a22697ed96daac50a840ca65558b220"
+        url = "https://github.com/immich-app/immich/archive/refs/tags/v1.123.0.tar.gz"
+        sha256 = "fcb894b1516a1ab258ea942cda57ece44892900303b5d0c4cf9593a60aaab4b8"
 
         autoupdate.strategy = "latest_github_release"
 

From f1b5e7487cd32c828bc65afad5e1f945daa266f2 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 18 Dec 2024 00:09:26 +0100
Subject: [PATCH 21/21] Auto-update READMEs

---
 README.md         | 2 +-
 README_es.md      | 2 +-
 README_eu.md      | 2 +-
 README_fr.md      | 2 +-
 README_gl.md      | 2 +-
 README_id.md      | 2 +-
 README_nl.md      | 2 +-
 README_pl.md      | 2 +-
 README_ru.md      | 2 +-
 README_zh_Hans.md | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 1476059..f1687a0 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Shipped version:** 1.122.3~ynh2
+**Shipped version:** 1.123.0~ynh1
 
 ## Screenshots
 
diff --git a/README_es.md b/README_es.md
index 1edcea2..a0d7867 100644
--- a/README_es.md
+++ b/README_es.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Versión actual:** 1.122.3~ynh2
+**Versión actual:** 1.123.0~ynh1
 
 ## Capturas
 
diff --git a/README_eu.md b/README_eu.md
index f726c90..ef06807 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Paketatutako bertsioa:** 1.122.3~ynh2
+**Paketatutako bertsioa:** 1.123.0~ynh1
 
 ## Pantaila-argazkiak
 
diff --git a/README_fr.md b/README_fr.md
index 551a087..f16ca09 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -26,7 +26,7 @@ Solution d'autohébergement pour a gestion de vos photos et vidéos.
 - Interface conviviale et egronomique ;
 
 
-**Version incluse :** 1.122.3~ynh2
+**Version incluse :** 1.123.0~ynh1
 
 ## Captures d’écran
 
diff --git a/README_gl.md b/README_gl.md
index c5a75ac..a9bea8a 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Versión proporcionada:** 1.122.3~ynh2
+**Versión proporcionada:** 1.123.0~ynh1
 
 ## Capturas de pantalla
 
diff --git a/README_id.md b/README_id.md
index 4a67700..e893292 100644
--- a/README_id.md
+++ b/README_id.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Versi terkirim:** 1.122.3~ynh2
+**Versi terkirim:** 1.123.0~ynh1
 
 ## Tangkapan Layar
 
diff --git a/README_nl.md b/README_nl.md
index c760f62..0afa4f0 100644
--- a/README_nl.md
+++ b/README_nl.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Geleverde versie:** 1.122.3~ynh2
+**Geleverde versie:** 1.123.0~ynh1
 
 ## Schermafdrukken
 
diff --git a/README_pl.md b/README_pl.md
index 1e65618..39d35af 100644
--- a/README_pl.md
+++ b/README_pl.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Dostarczona wersja:** 1.122.3~ynh2
+**Dostarczona wersja:** 1.123.0~ynh1
 
 ## Zrzuty ekranu
 
diff --git a/README_ru.md b/README_ru.md
index b2dd11c..eda9ca8 100644
--- a/README_ru.md
+++ b/README_ru.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Поставляемая версия:** 1.122.3~ynh2
+**Поставляемая версия:** 1.123.0~ynh1
 
 ## Снимки экрана
 
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index d4138e9..0bcde83 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -26,7 +26,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**分发版本：** 1.122.3~ynh2
+**分发版本：** 1.123.0~ynh1
 
 ## 截图