From 8b5b1088de219e047c990627e6b5b2878a1e1016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 18 Aug 2023 11:32:29 +0200
Subject: [PATCH 1/5] Update manifest.toml

---
 manifest.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 6b57871..08de97d 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -29,7 +29,6 @@ ram.runtime = "50M"
 [install]
     [install.domain]
     type = "domain"
-    full_domain = true
 
     [install.init_main_permission]
     type = "group"

From 0c499382910c5d506d790f5b671cdfc92fbd4529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 27 Sep 2023 15:15:02 +0200
Subject: [PATCH 2/5] Update systemd.service

---
 conf/systemd.service | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/systemd.service b/conf/systemd.service
index 7ed37f5..02b1307 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -8,6 +8,7 @@ User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
 ExecStart=__INSTALL_DIR__/listmonk
+RestartSec=2s
 Restart=always
 
 

From 8630d29bde84b309e4acdc6bddaa06aaeef6ebdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 27 Sep 2023 15:16:55 +0200
Subject: [PATCH 3/5] cleaning

---
 scripts/remove  | 1 +
 scripts/restore | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/remove b/scripts/remove
index 2e81091..26c9e7c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -14,6 +14,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # REMOVE SERVICE INTEGRATION IN YUNOHOST
 #=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
diff --git a/scripts/restore b/scripts/restore
index 80bcc27..5746e80 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -25,7 +25,7 @@ chmod +x "$install_dir/listmonk"
 #=================================================
 ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=6
 
-ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
+ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 
 #=================================================
 # RESTORE SYSTEMD
@@ -42,7 +42,7 @@ yunohost service add $app --description="Newsletter and mailing list manager" --
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=3
+ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 

From daa5c36ed69241bc6a083b10dcb31c1d94db0ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 27 Sep 2023 15:17:04 +0200
Subject: [PATCH 4/5] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index 08de97d..1b5ca1d 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Listmonk"
 description.en = "Newsletter and mailing list manager"
 description.fr = "Manager de newsletter et mailing list"
 
-version = "2.5.1~ynh1"
+version = "2.5.1~ynh2"
 
 maintainers = ["Navan Chauhan"]
 

From 0ae16f056f9e7a35191493342a7a775efe020e17 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 27 Sep 2023 13:17:08 +0000
Subject: [PATCH 5/5] 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 1cce4eb..db5d485 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Listmonk is a standalone, self-hosted, newsletter and mailing list manager. It is fast, feature-rich, and packed into a single binary. It uses a PostgreSQL database as its data base.
 
 
-**Shipped version:** 2.5.1~ynh1
+**Shipped version:** 2.5.1~ynh2
 
 **Demo:** https://demo.listmonk.app/
 
diff --git a/README_fr.md b/README_fr.md
index e6d4039..f5308cf 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 Listmonk est un gestionnaire de newsletter et de liste de diffusion autonome et auto-hébergé. Il est rapide, riche en fonctionnalités et emballé dans un seul binaire. Il utilise une base de données PostgreSQL comme base de données.
 
 
-**Version incluse :** 2.5.1~ynh1
+**Version incluse :** 2.5.1~ynh2
 
 **Démo :** https://demo.listmonk.app/