From 41177d9ffdd15e29c49ec94df616a05467b2a449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Nov 2023 19:26:17 +0100
Subject: [PATCH 1/8] cleaning

---
 manifest.toml   | 2 +-
 scripts/install | 7 ++-----
 scripts/restore | 1 -
 scripts/upgrade | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index a6e6a93..29be5d6 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -49,7 +49,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server, php8.2-curl, php8.2-mbstring, php8.2-mysql, php8.2-xml"
+    packages = "mariadb-server, php8.2-curl, php8.2-mbstring, php8.2-mysql, php8.2-xml, php8.2-openssl"
 
     [resources.database]
     type = "mysql"
diff --git a/scripts/install b/scripts/install
index b526c83..0128630 100755
--- a/scripts/install
+++ b/scripts/install
@@ -26,16 +26,13 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
-# Create a dedicated PHP-FPM config using the conf/php-fpm.conf or conf/extra_php-fpm.conf
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
-# Create a dedicated NGINX config using the conf/nginx.conf template
 ynh_add_nginx_config
 
-# Use logrotate to manage application logfile(s)
 ynh_use_logrotate
 
-ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
+ynh_add_config --template="cron" --destination="/etc/cron.d/$app"
 chown root: "/etc/cron.d/$app"
 chmod 644 "/etc/cron.d/$app"
 
diff --git a/scripts/restore b/scripts/restore
index ec6e678..bbfa999 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -48,7 +48,6 @@ ynh_restore_file --origin_path="/etc/cron.d/$app"
 #=================================================
 ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
 
-# Typically you only have either $app or php-fpm but not both at the same time...
 ynh_systemd_action --service_name=php$phpversion-fpm --action=reload
 
 ynh_systemd_action --service_name=nginx --action=reload
diff --git a/scripts/upgrade b/scripts/upgrade
index 1725046..2eed8cd 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -32,7 +32,7 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
 
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
 ynh_add_nginx_config
 

From 2c9f58d3392d806598b133f4726f7aad62220f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Nov 2023 19:33:30 +0100
Subject: [PATCH 2/8] fix

---
 conf/database.php | 98 +++++++++++++++++++++++++++++++++++++++++++++++
 scripts/install   |  8 ++--
 2 files changed, 102 insertions(+), 4 deletions(-)
 create mode 100644 conf/database.php

diff --git a/conf/database.php b/conf/database.php
new file mode 100644
index 0000000..a16ea1b
--- /dev/null
+++ b/conf/database.php
@@ -0,0 +1,98 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+| -------------------------------------------------------------------
+| DATABASE CONNECTIVITY SETTINGS
+| -------------------------------------------------------------------
+| This file will contain the settings needed to access your database.
+|
+| For complete instructions please consult the 'Database Connection'
+| page of the User Guide.
+|
+| -------------------------------------------------------------------
+| EXPLANATION OF VARIABLES
+| -------------------------------------------------------------------
+|
+|	['dsn']      The full DSN string describe a connection to the database.
+|	['hostname'] The hostname of your database server.
+|	['username'] The username used to connect to the database
+|	['password'] The password used to connect to the database
+|	['database'] The name of the database you want to connect to
+|	['dbdriver'] The database driver. e.g.: mysqli.
+|			Currently supported:
+|				 cubrid, ibase, mssql, mysql, mysqli, oci8,
+|				 odbc, pdo, postgre, sqlite, sqlite3, sqlsrv
+|	['dbprefix'] You can add an optional prefix, which will be added
+|				 to the table name when using the  Query Builder class
+|	['pconnect'] TRUE/FALSE - Whether to use a persistent connection
+|	['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
+|	['cache_on'] TRUE/FALSE - Enables/disables query caching
+|	['cachedir'] The path to the folder where cache files should be stored
+|	['char_set'] The character set used in communicating with the database
+|	['dbcollat'] The character collation used in communicating with the database
+|				 NOTE: For MySQL and MySQLi databases, this setting is only used
+| 				 as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7
+|				 (and in table creation queries made with DB Forge).
+| 				 There is an incompatibility in PHP with mysql_real_escape_string() which
+| 				 can make your site vulnerable to SQL injection if you are using a
+| 				 multi-byte character set and are running versions lower than these.
+| 				 Sites using Latin-1 or UTF-8 database character set and collation are unaffected.
+|	['swap_pre'] A default table prefix that should be swapped with the dbprefix
+|	['encrypt']  Whether or not to use an encrypted connection.
+|
+|			'mysql' (deprecated), 'sqlsrv' and 'pdo/sqlsrv' drivers accept TRUE/FALSE
+|			'mysqli' and 'pdo/mysql' drivers accept an array with the following options:
+|
+|				'ssl_key'    - Path to the private key file
+|				'ssl_cert'   - Path to the public key certificate file
+|				'ssl_ca'     - Path to the certificate authority file
+|				'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
+|				'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
+|				'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only)
+|
+|	['compress'] Whether or not to use client compression (MySQL only)
+|	['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
+|							- good for ensuring strict SQL while developing
+|	['ssl_options']	Used to set various SSL options that can be used when making SSL connections.
+|	['failover'] array - A array with 0 or more data for connections if the main should fail.
+|	['save_queries'] TRUE/FALSE - Whether to "save" all executed queries.
+| 				NOTE: Disabling this will also effectively disable both
+| 				$this->db->last_query() and profiling of DB queries.
+| 				When you run a query, with this setting set to TRUE (default),
+| 				CodeIgniter will store the SQL statement for debugging purposes.
+| 				However, this may cause high memory usage, especially if you run
+| 				a lot of SQL queries ... disable this to avoid that problem.
+|
+| The $active_group variable lets you choose which connection group to
+| make active.  By default there is only one group (the 'default' group).
+|
+| The $query_builder variables lets you determine whether or not to load
+| the query builder class.
+*/
+$active_group = 'default';
+$query_builder = TRUE;
+
+$db['default'] = array(
+	// The following values will probably need to be changed.
+	'dsn'	=> '',
+	'hostname' => 'localhost',
+	'username' => '__DB_NAME__',
+	'password' => '__DB_PWD__',
+	'database' => '__DB_USER__',
+	// The following values can probably stay the same.
+	'dbdriver' => 'mysqli',
+	'dbprefix' => '',
+	'pconnect' => TRUE,
+	'db_debug' => (ENVIRONMENT !== 'production'),
+	'cache_on' => FALSE,
+	'cachedir' => '',
+	'char_set' => 'utf8mb4',
+	'dbcollat' => 'utf8mb4_0900_ai_ci',
+	'swap_pre' => '',
+	'encrypt' => FALSE,
+	'compress' => FALSE,
+	'stricton' => FALSE,
+	'failover' => array(),
+	'save_queries' => TRUE
+);
diff --git a/scripts/install b/scripts/install
index 0128630..6faccc5 100755
--- a/scripts/install
+++ b/scripts/install
@@ -41,12 +41,12 @@ chmod 644 "/etc/cron.d/$app"
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
-# ynh_script_progression --message="Adding a configuration file..." --weight=1
+ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-# ynh_add_config --template="some_config_file" --destination="$install_dir/some_config_file"
+ynh_add_config --template="database.php" --destination="$install_dir/application/database.php"
 
-# chmod 400 "$install_dir/some_config_file"
-# chown $app:$app "$install_dir/some_config_file"
+chmod 400 "$install_dir/application/database.php"
+chown $app:$app "$install_dir/application/database.php"
 
 #=================================================
 # END OF SCRIPT

From e70478afb7a2059b9594b60881a5d4b3ad79da1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Nov 2023 19:34:46 +0100
Subject: [PATCH 3/8] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index 29be5d6..a6e6a93 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -49,7 +49,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server, php8.2-curl, php8.2-mbstring, php8.2-mysql, php8.2-xml, php8.2-openssl"
+    packages = "mariadb-server, php8.2-curl, php8.2-mbstring, php8.2-mysql, php8.2-xml"
 
     [resources.database]
     type = "mysql"

From 0641465ef577095ddb34912627f010357f4a0630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Nov 2023 19:38:48 +0100
Subject: [PATCH 4/8] Update install

---
 scripts/install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 6faccc5..50ae6b3 100755
--- a/scripts/install
+++ b/scripts/install
@@ -43,10 +43,10 @@ chmod 644 "/etc/cron.d/$app"
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="database.php" --destination="$install_dir/application/database.php"
+ynh_add_config --template="database.php" --destination="$install_dir/application/config/database.php"
 
-chmod 400 "$install_dir/application/database.php"
-chown $app:$app "$install_dir/application/database.php"
+chmod 400 "$install_dir/application/config/database.php"
+chown $app:$app "$install_dir/application/config/database.php"
 
 #=================================================
 # END OF SCRIPT

From de8f4dc17e21de97b421e1267d88554c0961efe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Nov 2023 19:40:01 +0100
Subject: [PATCH 5/8] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 50ae6b3..2da872c 100755
--- a/scripts/install
+++ b/scripts/install
@@ -45,7 +45,7 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1
 
 ynh_add_config --template="database.php" --destination="$install_dir/application/config/database.php"
 
-chmod 400 "$install_dir/application/config/database.php"
+chmod 650 "$install_dir/application/config/database.php"
 chown $app:$app "$install_dir/application/config/database.php"
 
 #=================================================

From a21a18dba8aa6fe35fdbfdc9671045db139d3ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Nov 2023 20:06:56 +0100
Subject: [PATCH 6/8] cleaning

---
 scripts/install | 12 ------------
 scripts/upgrade | 12 ------------
 2 files changed, 24 deletions(-)

diff --git a/scripts/install b/scripts/install
index 2da872c..812e74c 100755
--- a/scripts/install
+++ b/scripts/install
@@ -36,18 +36,6 @@ ynh_add_config --template="cron" --destination="/etc/cron.d/$app"
 chown root: "/etc/cron.d/$app"
 chmod 644 "/etc/cron.d/$app"
 
-#=================================================
-# APP INITIAL CONFIGURATION
-#=================================================
-# ADD A CONFIGURATION
-#=================================================
-ynh_script_progression --message="Adding a configuration file..." --weight=1
-
-ynh_add_config --template="database.php" --destination="$install_dir/application/config/database.php"
-
-chmod 650 "$install_dir/application/config/database.php"
-chown $app:$app "$install_dir/application/config/database.php"
-
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 2eed8cd..a559a01 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -38,18 +38,6 @@ ynh_add_nginx_config
 
 ynh_use_logrotate --non-append
 
-#=================================================
-# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...)
-#=================================================
-# UPDATE A CONFIG FILE
-#=================================================
-# ynh_script_progression --message="Updating a configuration file..." --weight=1
-
-# ynh_add_config --template="some_config_file" --destination="$install_dir/some_config_file"
-
-# chmod 400 "$install_dir/some_config_file"
-# chown $app:$app "$install_dir/some_config_file"
-
 #=================================================
 # END OF SCRIPT
 #=================================================

From 72864ca39b93ed280387fc2514a43aa3d2663728 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Tue, 14 Nov 2023 17:15:33 +0100
Subject: [PATCH 7/8] Upgrade to v2.5.1

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

diff --git a/manifest.toml b/manifest.toml
index a6e6a93..6703027 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "CloudLog"
 description.en = "Web based amateur radio logging application"
 description.fr = "Application Web d'enregistrement radioamateur"
 
-version = "2.5.0~ynh1"
+version = "2.5.1~ynh1"
 
 maintainers = ["eric_G"]
 
@@ -37,8 +37,8 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/magicbug/Cloudlog/archive/refs/tags/2.5.0.tar.gz"
-        sha256 = "074bdf9320ceb29e3705a8a63b2bdcddf1f9e6893be4b85522bc531ef12d06a6"
+        url = "https://github.com/magicbug/Cloudlog/archive/refs/tags/2.5.1.tar.gz"
+        sha256 = "ad7d680aa3b76f26741e387a73d07432614144e44031b0cdf04d11e9aec86772"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]

From f0a277dfb7f1b452a33014d360a4995fd7c90b03 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Tue, 14 Nov 2023 16:15:37 +0000
Subject: [PATCH 8/8] 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 aec9b74..789d66f 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Cloudlog is an open-source PHP & MySQL based amateur radio logging application,
 
 This is an ideal general-purpose logging application, supporting HF to Microwave, it can even interface with your radio via CAT, sync logs from WSJT-X & if you are a satellite operator integrates with SatPC32.
 
-**Shipped version:** 2.5.0~ynh1
+**Shipped version:** 2.5.1~ynh1
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 77bb08b..0348deb 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -20,7 +20,7 @@ Cloudlog est une application de journalisation radio amateur open-source basée
 
 Il s'agit d'une application de journalisation polyvalente idéale, prenant en charge HF vers micro-ondes, elle peut même s'interfacer avec votre radio via CAT, synchroniser les journaux de WSJT-X et si vous êtes un opérateur satellite, s'intègre à SatPC32.
 
-**Version incluse :** 2.5.0~ynh1
+**Version incluse :** 2.5.1~ynh1
 
 ## Captures d’écran