Merge pull request #177 from YunoHost-Apps/master-promotion

Upgrade master from testing
YunoHost-Apps · Feb 16, 2025 · dec1714 · dec1714
2 parents 4ba1520 + f65ea47
commit dec1714
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 18 deletions.
diff --git 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.126.1~ynh1
+**Shipped version:** 1.126.1~ynh2
 
 ## Screenshots
 

diff --git 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.126.1~ynh1
+**Versión actual:** 1.126.1~ynh2
 
 ## Capturas
 

diff --git 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.126.1~ynh1
+**Paketatutako bertsioa:** 1.126.1~ynh2
 
 ## Pantaila-argazkiak
 

diff --git a/README_fr.md b/README_fr.md
@@ -26,7 +26,7 @@ Solution d'autohébergement pour la gestion de vos photos et vidéos.
 - Interface conviviale et egronomique ;
 
 
-**Version incluse :** 1.126.1~ynh1
+**Version incluse :** 1.126.1~ynh2
 
 ## Captures d’écran
 

diff --git 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.126.1~ynh1
+**Versión proporcionada:** 1.126.1~ynh2
 
 ## Capturas de pantalla
 

diff --git 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.126.1~ynh1
+**Versi terkirim:** 1.126.1~ynh2
 
 ## Tangkapan Layar
 

diff --git 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.126.1~ynh1
+**Geleverde versie:** 1.126.1~ynh2
 
 ## Schermafdrukken
 

diff --git 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.126.1~ynh1
+**Dostarczona wersja:** 1.126.1~ynh2
 
 ## Zrzuty ekranu
 

diff --git 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.126.1~ynh1
+**Поставляемая версия:** 1.126.1~ynh2
 
 ## Снимки экрана
 

diff --git 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.126.1~ynh1
+**分发版本：** 1.126.1~ynh2
 
 ## 截图
 

diff --git a/doc/PRE_INSTALL.md b/doc/PRE_INSTALL.md
@@ -1,5 +1,3 @@
-As the pyhton version shipped in Debian stable is not always supported, a recent version could be built during the installation process. It may take a while to achieve that (15 to 60 minutes).
-
 This package provides support for the JPEG, PNG, WebP, AVIF (limited to 8-bit depth), TIFF, GIF and SVG (input) image formats.
 **HEIC/HEIF file format is not supported** (see cf. https://github.com/YunoHost-Apps/immich_ynh/issues/40#issuecomment-2096788600).
 

diff --git a/doc/PRE_INSTALL_fr.md b/doc/PRE_INSTALL_fr.md
@@ -1,5 +1,3 @@
-Comme la version python livrée dans Debian stable n'est pas toujours prise en charge, une version récente pourrait être construite pendant le processus d'installation. Cela peut prendre un certain temps pour y parvenir (15 à 60 minutes).
-
 Ce package supporte les formats d'images suivant : JPEG, PNG, WebP, AVIF (limité à profondeur de couleur de 8 bits), TIFF, GIF et SVG.
 **Le format HEIC/HEIF n'est pas supporté** (cf. https://github.com/YunoHost-Apps/immich_ynh/issues/40#issuecomment-2096788600).
 

diff --git 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.126.1~ynh1"
+version = "1.126.1~ynh2"
 
 maintainers = ["ewilly"]
 
@@ -120,6 +120,5 @@ ram.runtime = "500M"
         "postgresql-client-16"
     ]
 
-    # Commented to avoid provisionning a db on wrong cluster
-    #[resources.database]
-    #type = "postgresql"
+    [resources.database]
+    type = "postgresql"
diff --git a/scripts/_common.sh b/scripts/_common.sh
@@ -196,6 +196,20 @@ myynh_execute_psql_as_root() {
 		psql --cluster="$(app_psql_version)/main" "$database" --command="$sql"
 }
 
+# Drop default db & user created by [resources.database] in manifest
+myynh_deprovision_default() {
+	ynh_psql_database_exists $app && ynh_psql_drop_db $app || true
+	ynh_psql_user_exists $app && ynh_psql_drop_user $app || true
+}
+
+# Create the cluster
+myynh_create_psql_cluster() {
+	if [[ -z `pg_lsclusters | grep $(app_psql_version)` ]]
+	then
+		pg_createcluster $(app_psql_version) main --start
+	fi
+}
+
 # Install the database
 myynh_create_psql_db() {
 	myynh_execute_psql_as_root --sql="CREATE DATABASE $app;"

diff --git a/scripts/install b/scripts/install
@@ -27,7 +27,10 @@ ynh_nodejs_install
 #=================================================
 ynh_script_progression "Creating a PostgreSQL database..."
 
+myynh_deprovision_default
+
 db_pwd=$(ynh_string_random)
+myynh_create_psql_cluster
 myynh_update_psql_db
 myynh_create_psql_db
 db_port=$(myynh_execute_psql_as_root --sql="\conninfo" | awk -F '"' '{ print $(NF-1) }')

diff --git a/scripts/restore b/scripts/restore
@@ -30,7 +30,10 @@ ynh_nodejs_install
 #=================================================
 ynh_script_progression "Restoring the database..."
 
+myynh_deprovision_default
+
 db_pwd=$(ynh_app_setting_get --key=psql_pwd)
+myynh_create_psql_cluster
 myynh_update_psql_db
 myynh_create_psql_db
 myynh_restore_psql_db