From 0ad88749a8ba5aa080d629b703aed0526b75426b Mon Sep 17 00:00:00 2001
From: Mateusz <2871798+orhtej2@users.noreply.github.com>
Date: Sun, 2 Jun 2024 21:58:30 +0200
Subject: [PATCH] Cleanup config

---
 conf/config.properties          |  2 +-
 scripts/install                 |  2 +-
 scripts/restore                 |  2 +-
 scripts/upgrade                 |  2 +-
 sources/patches/proxy-001.patch | 41 ---------------------------------
 5 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 sources/patches/proxy-001.patch

diff --git a/conf/config.properties b/conf/config.properties
index c5b1d89..9a210d0 100644
--- a/conf/config.properties
+++ b/conf/config.properties
@@ -82,7 +82,7 @@ MATRIX_SERVER:https://matrix-client.matrix.org
 # Hibernate properties
 hibernate.connection.url:jdbc:postgresql://127.0.0.1:5432/__DB_NAME__
 hibernate.connection.driver_class:org.postgresql.Driver
-hibernate.dialect:org.hibernate.dialect.PostgreSQLDialect
+#hibernate.dialect:org.hibernate.dialect.PostgreSQLDialect
 hibernate.connection.username:__DB_USER__
 hibernate.connection.password:__DB_PWD__
 
diff --git a/scripts/install b/scripts/install
index bd0075b..973c749 100644
--- a/scripts/install
+++ b/scripts/install
@@ -119,7 +119,7 @@ yunohost service add "$app-proxy" --description="Piped HTTP proxy service" --log
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="HTTP Server is listening on"
+ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="Database connection is ready!"
 
 ynh_systemd_action --service_name=$app-proxy --action="start" --log_path="/var/log/$app/$app-proxy.log" --line_match="Running server!"
 
diff --git a/scripts/restore b/scripts/restore
index 166c7ca..14e6701 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -69,7 +69,7 @@ ynh_systemd_action --service_name=nginx --action=reload
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="HTTP Server is listening on"
+ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="Database connection is ready!"
 
 ynh_systemd_action --service_name=$app-proxy --action="start" --log_path="/var/log/$app/$app-proxy.log" --line_match="Running server!"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 54e5b52..08ec226 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -135,7 +135,7 @@ chmod 600 "$install_dir/config.properties"
 ynh_script_progression --message="Starting a systemd service..."
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="HTTP Server is listening on"
+ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="Database connection is ready!"
 
 ynh_systemd_action --service_name=$app-proxy --action="start" --log_path="/var/log/$app/$app-proxy.log" --line_match="Running server!"
 
diff --git a/sources/patches/proxy-001.patch b/sources/patches/proxy-001.patch
deleted file mode 100644
index 0edbf2d..0000000
--- a/sources/patches/proxy-001.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index e299b8c..3492d62 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1041,9 +1041,9 @@ dependencies = [
- 
- [[package]]
- name = "libmimalloc-sys"
--version = "0.1.37"
-+version = "0.1.35"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "81eb4061c0582dedea1cbc7aff2240300dd6982e0239d1c99e65c1dbf4a30ba7"
-+checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664"
- dependencies = [
-  "cc",
-  "libc",
-@@ -1125,9 +1125,9 @@ checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
- 
- [[package]]
- name = "mimalloc"
--version = "0.1.41"
-+version = "0.1.39"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9f41a2280ded0da56c8cf898babb86e8f10651a34adcfff190ae9a1159c6908d"
-+checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c"
- dependencies = [
-  "libmimalloc-sys",
- ]
-diff --git a/Cargo.toml b/Cargo.toml
-index 91444eb..da3f806 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -13,7 +13,7 @@ reqwest = { version = "0.11.27", features = ["stream", "brotli", "gzip", "socks"
- qstring = "0.7.2"
- 
- # Alternate Allocator 
--mimalloc = { version = "0.1.41", optional = true }
-+mimalloc = { version = "0.1.39", optional = true }
- 
- # Transcoding Images to WebP/AVIF to save bandwidth
- image = { version = "0.25.1", features = ["jpeg", "webp", "rayon"], default-features = false, optional = true }