From a5b75c7a47aefaa2a767563992a2b9d794c21861 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 8 Jan 2023 12:42:58 +0100 Subject: [PATCH 1/4] Make service start After postgresql --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 15da083..c9ab58e 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,6 +1,6 @@ [Unit] Description=Dentrite Matrix homeserver -After=network.target +After=network.target postgresql@__PSQL_VERSION__-main.service [Service] Type=simple From 52a4841ac204d595cb4d3bc35c217051ab32e926 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 8 Jan 2023 12:44:12 +0100 Subject: [PATCH 2/4] Bump package version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 5672886..cd609b6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Matrix homeserver of second generation", "fr": "Serveur Matrix de seconde génération" }, - "version": "0.10.8~ynh1", + "version": "0.10.8~ynh2", "url": "https://matrix.org/", "upstream": { "license": "Apache-2.0", From 9861c73cc9cf32f14aa7c203ed672856276c6005 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 8 Jan 2023 11:44:20 +0000 Subject: [PATCH 3/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 07423a1..bc18497 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Dendrite is a second-generation Matrix homeserver written in Go. It intends to p - Scalable: can run on multiple machines and eventually scale to massive homeserver deployments. -**Shipped version:** 0.10.8~ynh1 +**Shipped version:** 0.10.8~ynh2 ## Disclaimers / important information :warning: The upstream app is still in beta. Tread carefully. diff --git a/README_fr.md b/README_fr.md index 7551bf4..45cad86 100644 --- a/README_fr.md +++ b/README_fr.md @@ -24,7 +24,7 @@ Dendrite is a second-generation Matrix homeserver written in Go. It intends to p - Scalable: can run on multiple machines and eventually scale to massive homeserver deployments. -**Version incluse :** 0.10.8~ynh1 +**Version incluse :** 0.10.8~ynh2 ## Avertissements / informations importantes :warning: The upstream app is still in beta. Tread carefully. From 16fa478e1c138b5efa2c8cebaf797f231a0582dd Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 8 Jan 2023 13:11:57 +0100 Subject: [PATCH 4/4] Make sure the psql version is loaded --- scripts/change_url | 2 ++ scripts/install | 2 ++ scripts/upgrade | 2 ++ 3 files changed, 6 insertions(+) diff --git a/scripts/change_url b/scripts/change_url index 334bd88..ffd08b0 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -127,6 +127,8 @@ fi #================================================= ynh_script_progression --message="Updating systemd configuration..." --weight=1 +psql_version=$PSQL_VERSION + # Create a dedicated systemd config ynh_add_systemd_config diff --git a/scripts/install b/scripts/install index c5e3d25..ace39c9 100644 --- a/scripts/install +++ b/scripts/install @@ -182,6 +182,8 @@ chown $app:$app "$final_path/dendrite.yaml" #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 +psql_version=$PSQL_VERSION + # Create a dedicated systemd config ynh_add_systemd_config diff --git a/scripts/upgrade b/scripts/upgrade index 4715f07..928a84b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -194,6 +194,8 @@ chown $app:$app "$final_path/dendrite.yaml" #================================================= ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 +psql_version=$PSQL_VERSION + # Create a dedicated systemd config ynh_add_systemd_config