From ef9461a5b98d59f081935185074245da483d3f2b Mon Sep 17 00:00:00 2001
From: Jose Celano <josecelano@gmail.com>
Date: Mon, 17 Jun 2024 09:48:17 +0100
Subject: [PATCH 1/9] feat!: [#878] extract logging and core section in toml
 config files

---
 Containerfile                                 |  4 +--
 compose.yaml                                  |  2 +-
 docs/benchmarking.md                          |  2 ++
 docs/containers.md                            |  2 +-
 packages/configuration/src/v1/core.rs         | 19 ++++++-------
 packages/configuration/src/v1/logging.rs      | 27 +++++++++++++++++++
 packages/configuration/src/v1/mod.rs          | 21 +++++++++++++--
 packages/test-helpers/src/configuration.rs    |  2 +-
 share/container/entry_script_sh               | 10 +++----
 .../config/tracker.container.mysql.toml       |  1 +
 .../config/tracker.container.sqlite3.toml     |  1 +
 .../config/tracker.e2e.container.sqlite3.toml |  1 +
 .../config/tracker.udp.benchmarking.toml      |  3 +++
 src/bootstrap/logging.rs                      |  2 +-
 src/core/mod.rs                               |  3 +++
 src/lib.rs                                    |  5 +++-
 16 files changed, 80 insertions(+), 25 deletions(-)
 create mode 100644 packages/configuration/src/v1/logging.rs

diff --git a/Containerfile b/Containerfile
index 79fae692f..cdd70e337 100644
--- a/Containerfile
+++ b/Containerfile
@@ -96,7 +96,7 @@ RUN ["/busybox/cp", "-sp", "/busybox/sh","/busybox/cat","/busybox/ls","/busybox/
 COPY --from=gcc --chmod=0555 /usr/local/bin/su-exec /bin/su-exec
 
 ARG TORRUST_TRACKER_CONFIG_TOML_PATH="/etc/torrust/tracker/tracker.toml"
-ARG TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER="Sqlite3"
+ARG TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER="Sqlite3"
 ARG USER_ID=1000
 ARG UDP_PORT=6969
 ARG HTTP_PORT=7070
@@ -104,7 +104,7 @@ ARG API_PORT=1212
 ARG HEALTH_CHECK_API_PORT=1313
 
 ENV TORRUST_TRACKER_CONFIG_TOML_PATH=${TORRUST_TRACKER_CONFIG_TOML_PATH}
-ENV TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER}
+ENV TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER}
 ENV USER_ID=${USER_ID}
 ENV UDP_PORT=${UDP_PORT}
 ENV HTTP_PORT=${HTTP_PORT}
diff --git a/compose.yaml b/compose.yaml
index 1d425c743..a02302a26 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -4,7 +4,7 @@ services:
     image: torrust-tracker:release
     tty: true
     environment:
-      - TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER:-MySQL}
+      - TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER:-MySQL}
       - TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN=${TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN:-MyAccessToken}
     networks:
       - server_side
diff --git a/docs/benchmarking.md b/docs/benchmarking.md
index 1758e0de4..67b680fdc 100644
--- a/docs/benchmarking.md
+++ b/docs/benchmarking.md
@@ -29,6 +29,7 @@ cargo build --release -p aquatic_udp_load_test
 Run the tracker with UDP service enabled and other services disabled and set log level to `error`.
 
 ```toml
+[logging]
 log_level = "error"
 
 [[udp_trackers]]
@@ -163,6 +164,7 @@ Announce responses per info hash:
 Run the tracker with UDP service enabled and other services disabled and set log level to `error`.
 
 ```toml
+[logging]
 log_level = "error"
 
 [[udp_trackers]]
diff --git a/docs/containers.md b/docs/containers.md
index a0ba59d4b..ff15cd7cc 100644
--- a/docs/containers.md
+++ b/docs/containers.md
@@ -149,7 +149,7 @@ The following environmental variables can be set:
 
 - `TORRUST_TRACKER_CONFIG_TOML_PATH` - The in-container path to the tracker configuration file, (default: `"/etc/torrust/tracker/tracker.toml"`).
 - `TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN` - Override of the admin token. If set, this value overrides any value set in the config.
-- `TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER` - The database type used for the container, (options: `Sqlite3`, `MySQL`, default `Sqlite3`). Please Note: This dose not override the database configuration within the `.toml` config file.
+- `TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER` - The database type used for the container, (options: `Sqlite3`, `MySQL`, default `Sqlite3`). Please Note: This dose not override the database configuration within the `.toml` config file.
 - `TORRUST_TRACKER_CONFIG_TOML` - Load config from this environmental variable instead from a file, (i.e: `TORRUST_TRACKER_CONFIG_TOML=$(cat tracker-tracker.toml)`).
 - `USER_ID` - The user id for the runtime crated `torrust` user. Please Note: This user id should match the ownership of the host-mapped volumes, (default `1000`).
 - `UDP_PORT` - The port for the UDP tracker. This should match the port used in the configuration, (default `6969`).
diff --git a/packages/configuration/src/v1/core.rs b/packages/configuration/src/v1/core.rs
index 5d00c67ab..ae66f54fa 100644
--- a/packages/configuration/src/v1/core.rs
+++ b/packages/configuration/src/v1/core.rs
@@ -3,15 +3,11 @@ use std::net::{IpAddr, Ipv4Addr};
 use serde::{Deserialize, Serialize};
 use torrust_tracker_primitives::{DatabaseDriver, TrackerMode};
 
-use crate::{AnnouncePolicy, LogLevel};
+use crate::AnnouncePolicy;
 
 #[allow(clippy::struct_excessive_bools)]
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
 pub struct Core {
-    /// Logging level. Possible values are: `Off`, `Error`, `Warn`, `Info`,
-    /// `Debug` and `Trace`. Default is `Info`.
-    #[serde(default = "Core::default_log_level")]
-    pub log_level: Option<LogLevel>,
     /// Tracker mode. See [`TrackerMode`] for more information.
     #[serde(default = "Core::default_mode")]
     pub mode: TrackerMode,
@@ -20,6 +16,7 @@ pub struct Core {
     /// Database driver. Possible values are: `Sqlite3`, and `MySQL`.
     #[serde(default = "Core::default_db_driver")]
     pub db_driver: DatabaseDriver,
+
     /// Database connection string. The format depends on the database driver.
     /// For `Sqlite3`, the format is `path/to/database.db`, for example:
     /// `./storage/tracker/lib/database/sqlite3.db`.
@@ -35,11 +32,13 @@ pub struct Core {
     /// See [`AnnouncePolicy::interval_min`]
     #[serde(default = "AnnouncePolicy::default_interval_min")]
     pub min_announce_interval: u32,
+
     /// Weather the tracker is behind a reverse proxy or not.
     /// If the tracker is behind a reverse proxy, the `X-Forwarded-For` header
     /// sent from the proxy will be used to get the client's IP address.
     #[serde(default = "Core::default_on_reverse_proxy")]
     pub on_reverse_proxy: bool,
+
     /// The external IP address of the tracker. If the client is using a
     /// loopback IP address, this IP address will be used instead. If the peer
     /// is using a loopback IP address, the tracker assumes that the peer is
@@ -47,6 +46,7 @@ pub struct Core {
     /// address instead.
     #[serde(default = "Core::default_external_ip")]
     pub external_ip: Option<IpAddr>,
+
     /// Weather the tracker should collect statistics about tracker usage.
     /// If enabled, the tracker will collect statistics like the number of
     /// connections handled, the number of announce requests handled, etc.
@@ -54,6 +54,7 @@ pub struct Core {
     /// information about the collected metrics.
     #[serde(default = "Core::default_tracker_usage_statistics")]
     pub tracker_usage_statistics: bool,
+
     /// If enabled the tracker will persist the number of completed downloads.
     /// That's how many times a torrent has been downloaded completely.
     #[serde(default = "Core::default_persistent_torrent_completed_stat")]
@@ -65,10 +66,12 @@ pub struct Core {
     /// time, it will be removed from the torrent peer list.
     #[serde(default = "Core::default_max_peer_timeout")]
     pub max_peer_timeout: u32,
+
     /// Interval in seconds that the cleanup job will run to remove inactive
     /// peers from the torrent peer list.
     #[serde(default = "Core::default_inactive_peer_cleanup_interval")]
     pub inactive_peer_cleanup_interval: u64,
+
     /// If enabled, the tracker will remove torrents that have no peers.
     /// The clean up torrent job runs every `inactive_peer_cleanup_interval`
     /// seconds and it removes inactive peers. Eventually, the peer list of a
@@ -83,7 +86,6 @@ impl Default for Core {
         let announce_policy = AnnouncePolicy::default();
 
         Self {
-            log_level: Self::default_log_level(),
             mode: Self::default_mode(),
             db_driver: Self::default_db_driver(),
             db_path: Self::default_db_path(),
@@ -101,11 +103,6 @@ impl Default for Core {
 }
 
 impl Core {
-    #[allow(clippy::unnecessary_wraps)]
-    fn default_log_level() -> Option<LogLevel> {
-        Some(LogLevel::Info)
-    }
-
     fn default_mode() -> TrackerMode {
         TrackerMode::Public
     }
diff --git a/packages/configuration/src/v1/logging.rs b/packages/configuration/src/v1/logging.rs
new file mode 100644
index 000000000..c85564a05
--- /dev/null
+++ b/packages/configuration/src/v1/logging.rs
@@ -0,0 +1,27 @@
+use serde::{Deserialize, Serialize};
+
+use crate::LogLevel;
+
+#[allow(clippy::struct_excessive_bools)]
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
+pub struct Logging {
+    /// Logging level. Possible values are: `Off`, `Error`, `Warn`, `Info`,
+    /// `Debug` and `Trace`. Default is `Info`.
+    #[serde(default = "Logging::default_log_level")]
+    pub log_level: Option<LogLevel>,
+}
+
+impl Default for Logging {
+    fn default() -> Self {
+        Self {
+            log_level: Self::default_log_level(),
+        }
+    }
+}
+
+impl Logging {
+    #[allow(clippy::unnecessary_wraps)]
+    fn default_log_level() -> Option<LogLevel> {
+        Some(LogLevel::Info)
+    }
+}
diff --git a/packages/configuration/src/v1/mod.rs b/packages/configuration/src/v1/mod.rs
index 8d45270b8..809970506 100644
--- a/packages/configuration/src/v1/mod.rs
+++ b/packages/configuration/src/v1/mod.rs
@@ -193,7 +193,10 @@
 //! The default configuration is:
 //!
 //! ```toml
+//! [logging]
 //! log_level = "info"
+//!
+//! [core]
 //! mode = "public"
 //! db_driver = "Sqlite3"
 //! db_path = "./storage/tracker/lib/database/sqlite3.db"
@@ -233,6 +236,7 @@
 pub mod core;
 pub mod health_check_api;
 pub mod http_tracker;
+pub mod logging;
 pub mod tracker_api;
 pub mod udp_tracker;
 
@@ -241,6 +245,7 @@ use std::net::IpAddr;
 
 use figment::providers::{Env, Format, Serialized, Toml};
 use figment::Figment;
+use logging::Logging;
 use serde::{Deserialize, Serialize};
 
 use self::core::Core;
@@ -258,19 +263,25 @@ const CONFIG_OVERRIDE_SEPARATOR: &str = "__";
 /// Core configuration for the tracker.
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
 pub struct Configuration {
+    /// Logging configuration
+    pub logging: Logging,
+
     /// Core configuration.
-    #[serde(flatten)]
     pub core: Core,
+
     /// The list of UDP trackers the tracker is running. Each UDP tracker
     /// represents a UDP server that the tracker is running and it has its own
     /// configuration.
     pub udp_trackers: Vec<UdpTracker>,
+
     /// The list of HTTP trackers the tracker is running. Each HTTP tracker
     /// represents a HTTP server that the tracker is running and it has its own
     /// configuration.
     pub http_trackers: Vec<HttpTracker>,
+
     /// The HTTP API configuration.
     pub http_api: HttpApi,
+
     /// The Health Check API configuration.
     pub health_check_api: HealthCheckApi,
 }
@@ -278,6 +289,7 @@ pub struct Configuration {
 impl Default for Configuration {
     fn default() -> Self {
         Self {
+            logging: Logging::default(),
             core: Core::default(),
             udp_trackers: vec![UdpTracker::default()],
             http_trackers: vec![HttpTracker::default()],
@@ -365,7 +377,10 @@ mod tests {
 
     #[cfg(test)]
     fn default_config_toml() -> String {
-        let config = r#"log_level = "info"
+        let config = r#"[logging]
+                                log_level = "info"
+
+                                [core]
                                 mode = "public"
                                 db_driver = "Sqlite3"
                                 db_path = "./storage/tracker/lib/database/sqlite3.db"
@@ -475,6 +490,7 @@ mod tests {
     fn default_configuration_could_be_overwritten_from_a_single_env_var_with_toml_contents() {
         figment::Jail::expect_with(|_jail| {
             let config_toml = r#"
+                [core]
                 db_path = "OVERWRITTEN DEFAULT DB PATH"
             "#
             .to_string();
@@ -498,6 +514,7 @@ mod tests {
             jail.create_file(
                 "tracker.toml",
                 r#"
+                [core]
                 db_path = "OVERWRITTEN DEFAULT DB PATH"
             "#,
             )?;
diff --git a/packages/test-helpers/src/configuration.rs b/packages/test-helpers/src/configuration.rs
index 15ecd5280..c35d0a851 100644
--- a/packages/test-helpers/src/configuration.rs
+++ b/packages/test-helpers/src/configuration.rs
@@ -29,7 +29,7 @@ pub fn ephemeral() -> Configuration {
 
     let mut config = Configuration::default();
 
-    config.core.log_level = Some(LogLevel::Off); // Change to `debug` for tests debugging
+    config.logging.log_level = Some(LogLevel::Off); // Change to `debug` for tests debugging
 
     // Ephemeral socket address for API
     let api_port = 0u16;
diff --git a/share/container/entry_script_sh b/share/container/entry_script_sh
index 8c704ea67..51df717c6 100644
--- a/share/container/entry_script_sh
+++ b/share/container/entry_script_sh
@@ -26,8 +26,8 @@ chmod -R 2770 /var/lib/torrust /var/log/torrust /etc/torrust
 
 
 # Install the database and config:
-if [ -n "$TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER" ]; then
-    if cmp_lc "$TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER" "Sqlite3"; then
+if [ -n "$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER" ]; then
+    if cmp_lc "$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER" "Sqlite3"; then
 
         # Select Sqlite3 empty database
         default_database="/usr/share/torrust/default/database/tracker.sqlite3.db"
@@ -35,7 +35,7 @@ if [ -n "$TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER" ]; then
         # Select Sqlite3 default configuration
         default_config="/usr/share/torrust/default/config/tracker.container.sqlite3.toml"
 
-    elif cmp_lc "$TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER" "MySQL"; then
+    elif cmp_lc "$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER" "MySQL"; then
 
         # (no database file needed for MySQL)
 
@@ -43,12 +43,12 @@ if [ -n "$TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER" ]; then
         default_config="/usr/share/torrust/default/config/tracker.container.mysql.toml"
 
     else 
-        echo "Error: Unsupported Database Type: \"$TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER\"."
+        echo "Error: Unsupported Database Type: \"$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER\"."
         echo "Please Note: Supported Database Types: \"Sqlite3\", \"MySQL\"."
         exit 1
     fi
 else
-    echo "Error: \"\$TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER\" was not set!"; exit 1;
+    echo "Error: \"\$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER\" was not set!"; exit 1;
 fi
 
 install_config="/etc/torrust/tracker/tracker.toml"
diff --git a/share/default/config/tracker.container.mysql.toml b/share/default/config/tracker.container.mysql.toml
index 7678327ab..617450562 100644
--- a/share/default/config/tracker.container.mysql.toml
+++ b/share/default/config/tracker.container.mysql.toml
@@ -1,3 +1,4 @@
+[core]
 db_driver = "MySQL"
 db_path = "mysql://db_user:db_user_secret_password@mysql:3306/torrust_tracker"
 
diff --git a/share/default/config/tracker.container.sqlite3.toml b/share/default/config/tracker.container.sqlite3.toml
index da8259286..01ca655c3 100644
--- a/share/default/config/tracker.container.sqlite3.toml
+++ b/share/default/config/tracker.container.sqlite3.toml
@@ -1,3 +1,4 @@
+[core]
 db_path = "/var/lib/torrust/tracker/database/sqlite3.db"
 
 [[http_trackers]]
diff --git a/share/default/config/tracker.e2e.container.sqlite3.toml b/share/default/config/tracker.e2e.container.sqlite3.toml
index 767b56116..60d7a798a 100644
--- a/share/default/config/tracker.e2e.container.sqlite3.toml
+++ b/share/default/config/tracker.e2e.container.sqlite3.toml
@@ -1,3 +1,4 @@
+[core]
 db_path = "/var/lib/torrust/tracker/database/sqlite3.db"
 
 [[udp_trackers]]
diff --git a/share/default/config/tracker.udp.benchmarking.toml b/share/default/config/tracker.udp.benchmarking.toml
index 00f62628b..cd193c40a 100644
--- a/share/default/config/tracker.udp.benchmarking.toml
+++ b/share/default/config/tracker.udp.benchmarking.toml
@@ -1,4 +1,7 @@
+[logging]
 log_level = "error"
+
+[core]
 remove_peerless_torrents = false
 tracker_usage_statistics = false
 
diff --git a/src/bootstrap/logging.rs b/src/bootstrap/logging.rs
index 14756565f..f6868602d 100644
--- a/src/bootstrap/logging.rs
+++ b/src/bootstrap/logging.rs
@@ -20,7 +20,7 @@ static INIT: Once = Once::new();
 
 /// It redirects the log info to the standard output with the log level defined in the configuration
 pub fn setup(cfg: &Configuration) {
-    let tracing_level = config_level_or_default(&cfg.core.log_level);
+    let tracing_level = config_level_or_default(&cfg.logging.log_level);
 
     if tracing_level == LevelFilter::OFF {
         return;
diff --git a/src/core/mod.rs b/src/core/mod.rs
index 6af28199f..1b60ad6f9 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -312,7 +312,10 @@
 //! You can control the behavior of this module with the module settings:
 //!
 //! ```toml
+//! [logging]
 //! log_level = "debug"
+//!
+//! [core]
 //! mode = "public"
 //! db_driver = "Sqlite3"
 //! db_path = "./storage/tracker/lib/database/sqlite3.db"
diff --git a/src/lib.rs b/src/lib.rs
index 39d0b5b3d..2ed88a68b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -167,12 +167,15 @@
 //! The default configuration is:
 //!
 //! ```toml
+//! [logging]
+//! log_level = "info"
+//!
+//! [core]
 //! announce_interval = 120
 //! db_driver = "Sqlite3"
 //! db_path = "./storage/tracker/lib/database/sqlite3.db"
 //! external_ip = "0.0.0.0"
 //! inactive_peer_cleanup_interval = 600
-//! log_level = "info"
 //! max_peer_timeout = 900
 //! min_announce_interval = 120
 //! mode = "public"

From 77dd938f807cbf7d2e423f2ee584ca7b75287f10 Mon Sep 17 00:00:00 2001
From: Jose Celano <josecelano@gmail.com>
Date: Mon, 17 Jun 2024 16:08:23 +0100
Subject: [PATCH 2/9] feat!: [#878] make log_level config value mandatory

Althought, it has a default value `info` so you can omit it in the TOML
config file.
---
 packages/configuration/src/v1/logging.rs   |  7 +++----
 packages/test-helpers/src/configuration.rs |  2 +-
 src/bootstrap/logging.rs                   | 19 ++++++++-----------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/packages/configuration/src/v1/logging.rs b/packages/configuration/src/v1/logging.rs
index c85564a05..e33522db4 100644
--- a/packages/configuration/src/v1/logging.rs
+++ b/packages/configuration/src/v1/logging.rs
@@ -8,7 +8,7 @@ pub struct Logging {
     /// Logging level. Possible values are: `Off`, `Error`, `Warn`, `Info`,
     /// `Debug` and `Trace`. Default is `Info`.
     #[serde(default = "Logging::default_log_level")]
-    pub log_level: Option<LogLevel>,
+    pub log_level: LogLevel,
 }
 
 impl Default for Logging {
@@ -20,8 +20,7 @@ impl Default for Logging {
 }
 
 impl Logging {
-    #[allow(clippy::unnecessary_wraps)]
-    fn default_log_level() -> Option<LogLevel> {
-        Some(LogLevel::Info)
+    fn default_log_level() -> LogLevel {
+        LogLevel::Info
     }
 }
diff --git a/packages/test-helpers/src/configuration.rs b/packages/test-helpers/src/configuration.rs
index c35d0a851..f70bebcf7 100644
--- a/packages/test-helpers/src/configuration.rs
+++ b/packages/test-helpers/src/configuration.rs
@@ -29,7 +29,7 @@ pub fn ephemeral() -> Configuration {
 
     let mut config = Configuration::default();
 
-    config.logging.log_level = Some(LogLevel::Off); // Change to `debug` for tests debugging
+    config.logging.log_level = LogLevel::Off; // Change to `debug` for tests debugging
 
     // Ephemeral socket address for API
     let api_port = 0u16;
diff --git a/src/bootstrap/logging.rs b/src/bootstrap/logging.rs
index f6868602d..649495dc7 100644
--- a/src/bootstrap/logging.rs
+++ b/src/bootstrap/logging.rs
@@ -20,7 +20,7 @@ static INIT: Once = Once::new();
 
 /// It redirects the log info to the standard output with the log level defined in the configuration
 pub fn setup(cfg: &Configuration) {
-    let tracing_level = config_level_or_default(&cfg.logging.log_level);
+    let tracing_level = map_to_tracing_level_filter(&cfg.logging.log_level);
 
     if tracing_level == LevelFilter::OFF {
         return;
@@ -31,17 +31,14 @@ pub fn setup(cfg: &Configuration) {
     });
 }
 
-fn config_level_or_default(log_level: &Option<LogLevel>) -> LevelFilter {
+fn map_to_tracing_level_filter(log_level: &LogLevel) -> LevelFilter {
     match log_level {
-        None => LevelFilter::INFO,
-        Some(level) => match level {
-            LogLevel::Off => LevelFilter::OFF,
-            LogLevel::Error => LevelFilter::ERROR,
-            LogLevel::Warn => LevelFilter::WARN,
-            LogLevel::Info => LevelFilter::INFO,
-            LogLevel::Debug => LevelFilter::DEBUG,
-            LogLevel::Trace => LevelFilter::TRACE,
-        },
+        LogLevel::Off => LevelFilter::OFF,
+        LogLevel::Error => LevelFilter::ERROR,
+        LogLevel::Warn => LevelFilter::WARN,
+        LogLevel::Info => LevelFilter::INFO,
+        LogLevel::Debug => LevelFilter::DEBUG,
+        LogLevel::Trace => LevelFilter::TRACE,
     }
 }
 

From 2f94f6caa5673b898d7873b4570f4c87a26be15f Mon Sep 17 00:00:00 2001
From: Jose Celano <josecelano@gmail.com>
Date: Mon, 17 Jun 2024 16:39:01 +0100
Subject: [PATCH 3/9] feat!: [#878] extract database section in core config
 section

---
 Containerfile                                 |  4 +-
 compose.yaml                                  |  2 +-
 docs/containers.md                            |  7 ++--
 packages/configuration/src/v1/core.rs         | 29 ++++----------
 packages/configuration/src/v1/database.rs     | 38 +++++++++++++++++++
 packages/configuration/src/v1/mod.rs          | 25 +++++++-----
 packages/test-helpers/src/configuration.rs    |  2 +-
 share/container/entry_script_sh               | 10 ++---
 .../config/tracker.container.mysql.toml       |  6 +--
 .../config/tracker.container.sqlite3.toml     |  4 +-
 .../config/tracker.e2e.container.sqlite3.toml |  4 +-
 src/console/ci/e2e/logs_parser.rs             | 18 +--------
 src/core/mod.rs                               |  8 ++--
 src/lib.rs                                    |  6 ++-
 14 files changed, 92 insertions(+), 71 deletions(-)
 create mode 100644 packages/configuration/src/v1/database.rs

diff --git a/Containerfile b/Containerfile
index cdd70e337..d55d2f300 100644
--- a/Containerfile
+++ b/Containerfile
@@ -96,7 +96,7 @@ RUN ["/busybox/cp", "-sp", "/busybox/sh","/busybox/cat","/busybox/ls","/busybox/
 COPY --from=gcc --chmod=0555 /usr/local/bin/su-exec /bin/su-exec
 
 ARG TORRUST_TRACKER_CONFIG_TOML_PATH="/etc/torrust/tracker/tracker.toml"
-ARG TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER="Sqlite3"
+ARG TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER="Sqlite3"
 ARG USER_ID=1000
 ARG UDP_PORT=6969
 ARG HTTP_PORT=7070
@@ -104,7 +104,7 @@ ARG API_PORT=1212
 ARG HEALTH_CHECK_API_PORT=1313
 
 ENV TORRUST_TRACKER_CONFIG_TOML_PATH=${TORRUST_TRACKER_CONFIG_TOML_PATH}
-ENV TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER}
+ENV TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER}
 ENV USER_ID=${USER_ID}
 ENV UDP_PORT=${UDP_PORT}
 ENV HTTP_PORT=${HTTP_PORT}
diff --git a/compose.yaml b/compose.yaml
index a02302a26..cab5c6d5e 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -4,7 +4,7 @@ services:
     image: torrust-tracker:release
     tty: true
     environment:
-      - TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER:-MySQL}
+      - TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER:-MySQL}
       - TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN=${TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN:-MyAccessToken}
     networks:
       - server_side
diff --git a/docs/containers.md b/docs/containers.md
index ff15cd7cc..1a1ea2f0d 100644
--- a/docs/containers.md
+++ b/docs/containers.md
@@ -149,7 +149,7 @@ The following environmental variables can be set:
 
 - `TORRUST_TRACKER_CONFIG_TOML_PATH` - The in-container path to the tracker configuration file, (default: `"/etc/torrust/tracker/tracker.toml"`).
 - `TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN` - Override of the admin token. If set, this value overrides any value set in the config.
-- `TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER` - The database type used for the container, (options: `Sqlite3`, `MySQL`, default `Sqlite3`). Please Note: This dose not override the database configuration within the `.toml` config file.
+- `TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER` - The database type used for the container, (options: `Sqlite3`, `MySQL`, default `Sqlite3`). Please Note: This dose not override the database configuration within the `.toml` config file.
 - `TORRUST_TRACKER_CONFIG_TOML` - Load config from this environmental variable instead from a file, (i.e: `TORRUST_TRACKER_CONFIG_TOML=$(cat tracker-tracker.toml)`).
 - `USER_ID` - The user id for the runtime crated `torrust` user. Please Note: This user id should match the ownership of the host-mapped volumes, (default `1000`).
 - `UDP_PORT` - The port for the UDP tracker. This should match the port used in the configuration, (default `6969`).
@@ -243,8 +243,9 @@ podman run -it \
 The docker-compose configuration includes the MySQL service configuration. If you want to use MySQL instead of SQLite you should verify the `/etc/torrust/tracker/tracker.toml` (i.e `./storage/tracker/etc/tracker.toml`) configuration:
 
 ```toml
-db_driver = "MySQL"
-db_path = "mysql://db_user:db_user_secret_password@mysql:3306/torrust_tracker"
+[core.database]
+driver = "MySQL"
+path = "mysql://db_user:db_user_secret_password@mysql:3306/torrust_tracker"
 ```
 
 ### Build and Run:
diff --git a/packages/configuration/src/v1/core.rs b/packages/configuration/src/v1/core.rs
index ae66f54fa..17ac36ee0 100644
--- a/packages/configuration/src/v1/core.rs
+++ b/packages/configuration/src/v1/core.rs
@@ -1,8 +1,9 @@
 use std::net::{IpAddr, Ipv4Addr};
 
 use serde::{Deserialize, Serialize};
-use torrust_tracker_primitives::{DatabaseDriver, TrackerMode};
+use torrust_tracker_primitives::TrackerMode;
 
+use crate::v1::database::Database;
 use crate::AnnouncePolicy;
 
 #[allow(clippy::struct_excessive_bools)]
@@ -12,18 +13,9 @@ pub struct Core {
     #[serde(default = "Core::default_mode")]
     pub mode: TrackerMode,
 
-    // Database configuration
-    /// Database driver. Possible values are: `Sqlite3`, and `MySQL`.
-    #[serde(default = "Core::default_db_driver")]
-    pub db_driver: DatabaseDriver,
-
-    /// Database connection string. The format depends on the database driver.
-    /// For `Sqlite3`, the format is `path/to/database.db`, for example:
-    /// `./storage/tracker/lib/database/sqlite3.db`.
-    /// For `Mysql`, the format is `mysql://db_user:db_user_password:port/db_name`, for
-    /// example: `root:password@localhost:3306/torrust`.
-    #[serde(default = "Core::default_db_path")]
-    pub db_path: String,
+    // Database configuration.
+    #[serde(default = "Core::default_database")]
+    pub database: Database,
 
     /// See [`AnnouncePolicy::interval`]
     #[serde(default = "AnnouncePolicy::default_interval")]
@@ -87,8 +79,7 @@ impl Default for Core {
 
         Self {
             mode: Self::default_mode(),
-            db_driver: Self::default_db_driver(),
-            db_path: Self::default_db_path(),
+            database: Self::default_database(),
             announce_interval: announce_policy.interval,
             min_announce_interval: announce_policy.interval_min,
             max_peer_timeout: Self::default_max_peer_timeout(),
@@ -107,12 +98,8 @@ impl Core {
         TrackerMode::Public
     }
 
-    fn default_db_driver() -> DatabaseDriver {
-        DatabaseDriver::Sqlite3
-    }
-
-    fn default_db_path() -> String {
-        String::from("./storage/tracker/lib/database/sqlite3.db")
+    fn default_database() -> Database {
+        Database::default()
     }
 
     fn default_on_reverse_proxy() -> bool {
diff --git a/packages/configuration/src/v1/database.rs b/packages/configuration/src/v1/database.rs
new file mode 100644
index 000000000..b029175ce
--- /dev/null
+++ b/packages/configuration/src/v1/database.rs
@@ -0,0 +1,38 @@
+use serde::{Deserialize, Serialize};
+use torrust_tracker_primitives::DatabaseDriver;
+
+#[allow(clippy::struct_excessive_bools)]
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
+pub struct Database {
+    // Database configuration
+    /// Database driver. Possible values are: `Sqlite3`, and `MySQL`.
+    #[serde(default = "Database::default_driver")]
+    pub driver: DatabaseDriver,
+
+    /// Database connection string. The format depends on the database driver.
+    /// For `Sqlite3`, the format is `path/to/database.db`, for example:
+    /// `./storage/tracker/lib/database/sqlite3.db`.
+    /// For `Mysql`, the format is `mysql://db_user:db_user_password:port/db_name`, for
+    /// example: `root:password@localhost:3306/torrust`.
+    #[serde(default = "Database::default_path")]
+    pub path: String,
+}
+
+impl Default for Database {
+    fn default() -> Self {
+        Self {
+            driver: Self::default_driver(),
+            path: Self::default_path(),
+        }
+    }
+}
+
+impl Database {
+    fn default_driver() -> DatabaseDriver {
+        DatabaseDriver::Sqlite3
+    }
+
+    fn default_path() -> String {
+        String::from("./storage/tracker/lib/database/sqlite3.db")
+    }
+}
diff --git a/packages/configuration/src/v1/mod.rs b/packages/configuration/src/v1/mod.rs
index 809970506..5b3cad3ea 100644
--- a/packages/configuration/src/v1/mod.rs
+++ b/packages/configuration/src/v1/mod.rs
@@ -198,8 +198,6 @@
 //!
 //! [core]
 //! mode = "public"
-//! db_driver = "Sqlite3"
-//! db_path = "./storage/tracker/lib/database/sqlite3.db"
 //! announce_interval = 120
 //! min_announce_interval = 120
 //! on_reverse_proxy = false
@@ -210,6 +208,10 @@
 //! inactive_peer_cleanup_interval = 600
 //! remove_peerless_torrents = true
 //!
+//!   [core.database]
+//!   driver = "Sqlite3"
+//!   path = "./storage/tracker/lib/database/sqlite3.db"
+//!
 //! [[udp_trackers]]
 //! enabled = false
 //! bind_address = "0.0.0.0:6969"
@@ -234,6 +236,7 @@
 //! bind_address = "127.0.0.1:1313"
 //!```
 pub mod core;
+pub mod database;
 pub mod health_check_api;
 pub mod http_tracker;
 pub mod logging;
@@ -382,8 +385,6 @@ mod tests {
 
                                 [core]
                                 mode = "public"
-                                db_driver = "Sqlite3"
-                                db_path = "./storage/tracker/lib/database/sqlite3.db"
                                 announce_interval = 120
                                 min_announce_interval = 120
                                 on_reverse_proxy = false
@@ -394,6 +395,10 @@ mod tests {
                                 inactive_peer_cleanup_interval = 600
                                 remove_peerless_torrents = true
 
+                                  [core.database]
+                                  driver = "Sqlite3"
+                                  path = "./storage/tracker/lib/database/sqlite3.db"
+                                
                                 [[udp_trackers]]
                                 enabled = false
                                 bind_address = "0.0.0.0:6969"
@@ -490,8 +495,8 @@ mod tests {
     fn default_configuration_could_be_overwritten_from_a_single_env_var_with_toml_contents() {
         figment::Jail::expect_with(|_jail| {
             let config_toml = r#"
-                [core]
-                db_path = "OVERWRITTEN DEFAULT DB PATH"
+                [core.database]
+                path = "OVERWRITTEN DEFAULT DB PATH"
             "#
             .to_string();
 
@@ -502,7 +507,7 @@ mod tests {
 
             let configuration = Configuration::load(&info).expect("Could not load configuration from file");
 
-            assert_eq!(configuration.core.db_path, "OVERWRITTEN DEFAULT DB PATH".to_string());
+            assert_eq!(configuration.core.database.path, "OVERWRITTEN DEFAULT DB PATH".to_string());
 
             Ok(())
         });
@@ -514,8 +519,8 @@ mod tests {
             jail.create_file(
                 "tracker.toml",
                 r#"
-                [core]
-                db_path = "OVERWRITTEN DEFAULT DB PATH"
+                [core.database]
+                path = "OVERWRITTEN DEFAULT DB PATH"
             "#,
             )?;
 
@@ -526,7 +531,7 @@ mod tests {
 
             let configuration = Configuration::load(&info).expect("Could not load configuration from file");
 
-            assert_eq!(configuration.core.db_path, "OVERWRITTEN DEFAULT DB PATH".to_string());
+            assert_eq!(configuration.core.database.path, "OVERWRITTEN DEFAULT DB PATH".to_string());
 
             Ok(())
         });
diff --git a/packages/test-helpers/src/configuration.rs b/packages/test-helpers/src/configuration.rs
index f70bebcf7..fe05407d9 100644
--- a/packages/test-helpers/src/configuration.rs
+++ b/packages/test-helpers/src/configuration.rs
@@ -54,7 +54,7 @@ pub fn ephemeral() -> Configuration {
     let temp_directory = env::temp_dir();
     let random_db_id = random::string(16);
     let temp_file = temp_directory.join(format!("data_{random_db_id}.db"));
-    temp_file.to_str().unwrap().clone_into(&mut config.core.db_path);
+    temp_file.to_str().unwrap().clone_into(&mut config.core.database.path);
 
     config
 }
diff --git a/share/container/entry_script_sh b/share/container/entry_script_sh
index 51df717c6..0668114fd 100644
--- a/share/container/entry_script_sh
+++ b/share/container/entry_script_sh
@@ -26,8 +26,8 @@ chmod -R 2770 /var/lib/torrust /var/log/torrust /etc/torrust
 
 
 # Install the database and config:
-if [ -n "$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER" ]; then
-    if cmp_lc "$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER" "Sqlite3"; then
+if [ -n "$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER" ]; then
+    if cmp_lc "$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER" "Sqlite3"; then
 
         # Select Sqlite3 empty database
         default_database="/usr/share/torrust/default/database/tracker.sqlite3.db"
@@ -35,7 +35,7 @@ if [ -n "$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER" ]; then
         # Select Sqlite3 default configuration
         default_config="/usr/share/torrust/default/config/tracker.container.sqlite3.toml"
 
-    elif cmp_lc "$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER" "MySQL"; then
+    elif cmp_lc "$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER" "MySQL"; then
 
         # (no database file needed for MySQL)
 
@@ -43,12 +43,12 @@ if [ -n "$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER" ]; then
         default_config="/usr/share/torrust/default/config/tracker.container.mysql.toml"
 
     else 
-        echo "Error: Unsupported Database Type: \"$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER\"."
+        echo "Error: Unsupported Database Type: \"$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER\"."
         echo "Please Note: Supported Database Types: \"Sqlite3\", \"MySQL\"."
         exit 1
     fi
 else
-    echo "Error: \"\$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DB_DRIVER\" was not set!"; exit 1;
+    echo "Error: \"\$TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER\" was not set!"; exit 1;
 fi
 
 install_config="/etc/torrust/tracker/tracker.toml"
diff --git a/share/default/config/tracker.container.mysql.toml b/share/default/config/tracker.container.mysql.toml
index 617450562..75cc57b64 100644
--- a/share/default/config/tracker.container.mysql.toml
+++ b/share/default/config/tracker.container.mysql.toml
@@ -1,6 +1,6 @@
-[core]
-db_driver = "MySQL"
-db_path = "mysql://db_user:db_user_secret_password@mysql:3306/torrust_tracker"
+[core.database]
+driver = "MySQL"
+path = "mysql://db_user:db_user_secret_password@mysql:3306/torrust_tracker"
 
 [[http_trackers]]
 ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
diff --git a/share/default/config/tracker.container.sqlite3.toml b/share/default/config/tracker.container.sqlite3.toml
index 01ca655c3..433e36127 100644
--- a/share/default/config/tracker.container.sqlite3.toml
+++ b/share/default/config/tracker.container.sqlite3.toml
@@ -1,5 +1,5 @@
-[core]
-db_path = "/var/lib/torrust/tracker/database/sqlite3.db"
+[core.database]
+path = "/var/lib/torrust/tracker/database/sqlite3.db"
 
 [[http_trackers]]
 ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
diff --git a/share/default/config/tracker.e2e.container.sqlite3.toml b/share/default/config/tracker.e2e.container.sqlite3.toml
index 60d7a798a..b8adedefb 100644
--- a/share/default/config/tracker.e2e.container.sqlite3.toml
+++ b/share/default/config/tracker.e2e.container.sqlite3.toml
@@ -1,5 +1,5 @@
-[core]
-db_path = "/var/lib/torrust/tracker/database/sqlite3.db"
+[core.database]
+path = "/var/lib/torrust/tracker/database/sqlite3.db"
 
 [[udp_trackers]]
 enabled = true
diff --git a/src/console/ci/e2e/logs_parser.rs b/src/console/ci/e2e/logs_parser.rs
index a4024f29d..4886786de 100644
--- a/src/console/ci/e2e/logs_parser.rs
+++ b/src/console/ci/e2e/logs_parser.rs
@@ -112,21 +112,7 @@ mod tests {
 
     #[test]
     fn it_should_parse_from_logs_with_valid_logs() {
-        let logs = r#"
-            Loading configuration from environment variable db_path = "/var/lib/torrust/tracker/database/sqlite3.db"
-
-            [[udp_trackers]]
-            enabled = true
-
-            [[http_trackers]]
-            enabled = true
-            ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
-            ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
-
-            [http_api]
-            ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
-            ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
-
+        let logs = r"
             Loading configuration from default configuration file: `./share/default/config/tracker.development.sqlite3.toml` ...
             2024-06-10T16:07:39.989540Z  INFO torrust_tracker::bootstrap::logging: logging initialized.
             2024-06-10T16:07:39.990244Z  INFO UDP TRACKER: Starting on: udp://0.0.0.0:6969
@@ -139,7 +125,7 @@ mod tests {
             2024-06-10T16:07:39.990565Z  INFO API: Started on http://127.0.0.1:1212
             2024-06-10T16:07:39.990577Z  INFO HEALTH CHECK API: Starting on: http://127.0.0.1:1313
             2024-06-10T16:07:39.990638Z  INFO HEALTH CHECK API: Started on: http://127.0.0.1:1313
-            "#;
+            ";
 
         let running_services = RunningServices::parse_from_logs(logs);
 
diff --git a/src/core/mod.rs b/src/core/mod.rs
index 1b60ad6f9..c5171ab58 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -317,8 +317,6 @@
 //!
 //! [core]
 //! mode = "public"
-//! db_driver = "Sqlite3"
-//! db_path = "./storage/tracker/lib/database/sqlite3.db"
 //! announce_interval = 120
 //! min_announce_interval = 120
 //! max_peer_timeout = 900
@@ -328,6 +326,10 @@
 //! persistent_torrent_completed_stat = true
 //! inactive_peer_cleanup_interval = 600
 //! remove_peerless_torrents = false
+//!
+//!   [core.database]
+//!   driver = "Sqlite3"
+//!   path = "./storage/tracker/lib/database/sqlite3.db"
 //! ```
 //!
 //! Refer to the [`configuration` module documentation](https://docs.rs/torrust-tracker-configuration) to get more information about all options.
@@ -548,7 +550,7 @@ impl Tracker {
         stats_event_sender: Option<Box<dyn statistics::EventSender>>,
         stats_repository: statistics::Repo,
     ) -> Result<Tracker, databases::error::Error> {
-        let database = Arc::new(databases::driver::build(&config.db_driver, &config.db_path)?);
+        let database = Arc::new(databases::driver::build(&config.database.driver, &config.database.path)?);
 
         let mode = config.mode.clone();
 
diff --git a/src/lib.rs b/src/lib.rs
index 2ed88a68b..b94da4717 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -172,8 +172,6 @@
 //!
 //! [core]
 //! announce_interval = 120
-//! db_driver = "Sqlite3"
-//! db_path = "./storage/tracker/lib/database/sqlite3.db"
 //! external_ip = "0.0.0.0"
 //! inactive_peer_cleanup_interval = 600
 //! max_peer_timeout = 900
@@ -184,6 +182,10 @@
 //! remove_peerless_torrents = true
 //! tracker_usage_statistics = true
 //!
+//!   [core.database]
+//!   driver = "Sqlite3"
+//!   path = "./storage/tracker/lib/database/sqlite3.db"
+//!
 //! [[udp_trackers]]
 //! bind_address = "0.0.0.0:6969"
 //! enabled = false

From edc706cc146035d586e86741da7b1df1db4bd08d Mon Sep 17 00:00:00 2001
From: Jose Celano <josecelano@gmail.com>
Date: Mon, 17 Jun 2024 16:59:42 +0100
Subject: [PATCH 4/9] feat!: [#878] extract net section in core config section

---
 packages/configuration/src/v1/core.rs      | 55 ++++++++--------------
 packages/configuration/src/v1/mod.rs       | 34 ++++++++-----
 packages/configuration/src/v1/network.rs   | 41 ++++++++++++++++
 packages/test-helpers/src/configuration.rs |  6 +--
 src/core/mod.rs                            | 16 ++++---
 src/lib.rs                                 |  6 ++-
 src/servers/http/v1/services/announce.rs   |  2 +-
 src/servers/udp/handlers.rs                |  2 +-
 8 files changed, 99 insertions(+), 63 deletions(-)
 create mode 100644 packages/configuration/src/v1/network.rs

diff --git a/packages/configuration/src/v1/core.rs b/packages/configuration/src/v1/core.rs
index 17ac36ee0..5d8ab0b33 100644
--- a/packages/configuration/src/v1/core.rs
+++ b/packages/configuration/src/v1/core.rs
@@ -1,8 +1,7 @@
-use std::net::{IpAddr, Ipv4Addr};
-
 use serde::{Deserialize, Serialize};
 use torrust_tracker_primitives::TrackerMode;
 
+use super::network::Network;
 use crate::v1::database::Database;
 use crate::AnnouncePolicy;
 
@@ -13,10 +12,6 @@ pub struct Core {
     #[serde(default = "Core::default_mode")]
     pub mode: TrackerMode,
 
-    // Database configuration.
-    #[serde(default = "Core::default_database")]
-    pub database: Database,
-
     /// See [`AnnouncePolicy::interval`]
     #[serde(default = "AnnouncePolicy::default_interval")]
     pub announce_interval: u32,
@@ -25,20 +20,6 @@ pub struct Core {
     #[serde(default = "AnnouncePolicy::default_interval_min")]
     pub min_announce_interval: u32,
 
-    /// Weather the tracker is behind a reverse proxy or not.
-    /// If the tracker is behind a reverse proxy, the `X-Forwarded-For` header
-    /// sent from the proxy will be used to get the client's IP address.
-    #[serde(default = "Core::default_on_reverse_proxy")]
-    pub on_reverse_proxy: bool,
-
-    /// The external IP address of the tracker. If the client is using a
-    /// loopback IP address, this IP address will be used instead. If the peer
-    /// is using a loopback IP address, the tracker assumes that the peer is
-    /// in the same network as the tracker and will use the tracker's IP
-    /// address instead.
-    #[serde(default = "Core::default_external_ip")]
-    pub external_ip: Option<IpAddr>,
-
     /// Weather the tracker should collect statistics about tracker usage.
     /// If enabled, the tracker will collect statistics like the number of
     /// connections handled, the number of announce requests handled, etc.
@@ -71,6 +52,14 @@ pub struct Core {
     /// enabled.
     #[serde(default = "Core::default_remove_peerless_torrents")]
     pub remove_peerless_torrents: bool,
+
+    // Database configuration.
+    #[serde(default = "Core::default_database")]
+    pub database: Database,
+
+    // Network configuration.
+    #[serde(default = "Core::default_network")]
+    pub net: Network,
 }
 
 impl Default for Core {
@@ -79,16 +68,15 @@ impl Default for Core {
 
         Self {
             mode: Self::default_mode(),
-            database: Self::default_database(),
             announce_interval: announce_policy.interval,
             min_announce_interval: announce_policy.interval_min,
             max_peer_timeout: Self::default_max_peer_timeout(),
-            on_reverse_proxy: Self::default_on_reverse_proxy(),
-            external_ip: Self::default_external_ip(),
             tracker_usage_statistics: Self::default_tracker_usage_statistics(),
             persistent_torrent_completed_stat: Self::default_persistent_torrent_completed_stat(),
             inactive_peer_cleanup_interval: Self::default_inactive_peer_cleanup_interval(),
             remove_peerless_torrents: Self::default_remove_peerless_torrents(),
+            database: Self::default_database(),
+            net: Self::default_network(),
         }
     }
 }
@@ -98,19 +86,6 @@ impl Core {
         TrackerMode::Public
     }
 
-    fn default_database() -> Database {
-        Database::default()
-    }
-
-    fn default_on_reverse_proxy() -> bool {
-        false
-    }
-
-    #[allow(clippy::unnecessary_wraps)]
-    fn default_external_ip() -> Option<IpAddr> {
-        Some(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)))
-    }
-
     fn default_tracker_usage_statistics() -> bool {
         true
     }
@@ -130,4 +105,12 @@ impl Core {
     fn default_remove_peerless_torrents() -> bool {
         true
     }
+
+    fn default_database() -> Database {
+        Database::default()
+    }
+
+    fn default_network() -> Network {
+        Network::default()
+    }
 }
diff --git a/packages/configuration/src/v1/mod.rs b/packages/configuration/src/v1/mod.rs
index 5b3cad3ea..d96e1335c 100644
--- a/packages/configuration/src/v1/mod.rs
+++ b/packages/configuration/src/v1/mod.rs
@@ -200,17 +200,19 @@
 //! mode = "public"
 //! announce_interval = 120
 //! min_announce_interval = 120
-//! on_reverse_proxy = false
-//! external_ip = "0.0.0.0"
 //! tracker_usage_statistics = true
 //! persistent_torrent_completed_stat = false
 //! max_peer_timeout = 900
 //! inactive_peer_cleanup_interval = 600
 //! remove_peerless_torrents = true
 //!
-//!   [core.database]
-//!   driver = "Sqlite3"
-//!   path = "./storage/tracker/lib/database/sqlite3.db"
+//! [core.database]
+//! driver = "Sqlite3"
+//! path = "./storage/tracker/lib/database/sqlite3.db"
+//!
+//! [core.net]
+//! external_ip = "0.0.0.0"
+//! on_reverse_proxy = false
 //!
 //! [[udp_trackers]]
 //! enabled = false
@@ -240,6 +242,7 @@ pub mod database;
 pub mod health_check_api;
 pub mod http_tracker;
 pub mod logging;
+pub mod network;
 pub mod tracker_api;
 pub mod udp_tracker;
 
@@ -307,7 +310,7 @@ impl Configuration {
     /// and `None` otherwise.
     #[must_use]
     pub fn get_ext_ip(&self) -> Option<IpAddr> {
-        self.core.external_ip.as_ref().map(|external_ip| *external_ip)
+        self.core.net.external_ip.as_ref().map(|external_ip| *external_ip)
     }
 
     /// Saves the default configuration at the given path.
@@ -387,18 +390,20 @@ mod tests {
                                 mode = "public"
                                 announce_interval = 120
                                 min_announce_interval = 120
-                                on_reverse_proxy = false
-                                external_ip = "0.0.0.0"
                                 tracker_usage_statistics = true
                                 persistent_torrent_completed_stat = false
                                 max_peer_timeout = 900
                                 inactive_peer_cleanup_interval = 600
                                 remove_peerless_torrents = true
 
-                                  [core.database]
-                                  driver = "Sqlite3"
-                                  path = "./storage/tracker/lib/database/sqlite3.db"
-                                
+                                [core.database]
+                                driver = "Sqlite3"
+                                path = "./storage/tracker/lib/database/sqlite3.db"
+
+                                [core.net]
+                                external_ip = "0.0.0.0"
+                                on_reverse_proxy = false
+
                                 [[udp_trackers]]
                                 enabled = false
                                 bind_address = "0.0.0.0:6969"
@@ -443,7 +448,10 @@ mod tests {
     fn configuration_should_contain_the_external_ip() {
         let configuration = Configuration::default();
 
-        assert_eq!(configuration.core.external_ip, Some(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0))));
+        assert_eq!(
+            configuration.core.net.external_ip,
+            Some(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)))
+        );
     }
 
     #[test]
diff --git a/packages/configuration/src/v1/network.rs b/packages/configuration/src/v1/network.rs
new file mode 100644
index 000000000..8e53d419c
--- /dev/null
+++ b/packages/configuration/src/v1/network.rs
@@ -0,0 +1,41 @@
+use std::net::{IpAddr, Ipv4Addr};
+
+use serde::{Deserialize, Serialize};
+
+#[allow(clippy::struct_excessive_bools)]
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
+pub struct Network {
+    /// The external IP address of the tracker. If the client is using a
+    /// loopback IP address, this IP address will be used instead. If the peer
+    /// is using a loopback IP address, the tracker assumes that the peer is
+    /// in the same network as the tracker and will use the tracker's IP
+    /// address instead.
+    #[serde(default = "Network::default_external_ip")]
+    pub external_ip: Option<IpAddr>,
+
+    /// Weather the tracker is behind a reverse proxy or not.
+    /// If the tracker is behind a reverse proxy, the `X-Forwarded-For` header
+    /// sent from the proxy will be used to get the client's IP address.
+    #[serde(default = "Network::default_on_reverse_proxy")]
+    pub on_reverse_proxy: bool,
+}
+
+impl Default for Network {
+    fn default() -> Self {
+        Self {
+            external_ip: Self::default_external_ip(),
+            on_reverse_proxy: Self::default_on_reverse_proxy(),
+        }
+    }
+}
+
+impl Network {
+    #[allow(clippy::unnecessary_wraps)]
+    fn default_external_ip() -> Option<IpAddr> {
+        Some(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)))
+    }
+
+    fn default_on_reverse_proxy() -> bool {
+        false
+    }
+}
diff --git a/packages/test-helpers/src/configuration.rs b/packages/test-helpers/src/configuration.rs
index fe05407d9..9c6c0fe11 100644
--- a/packages/test-helpers/src/configuration.rs
+++ b/packages/test-helpers/src/configuration.rs
@@ -64,7 +64,7 @@ pub fn ephemeral() -> Configuration {
 pub fn ephemeral_with_reverse_proxy() -> Configuration {
     let mut cfg = ephemeral();
 
-    cfg.core.on_reverse_proxy = true;
+    cfg.core.net.on_reverse_proxy = true;
 
     cfg
 }
@@ -74,7 +74,7 @@ pub fn ephemeral_with_reverse_proxy() -> Configuration {
 pub fn ephemeral_without_reverse_proxy() -> Configuration {
     let mut cfg = ephemeral();
 
-    cfg.core.on_reverse_proxy = false;
+    cfg.core.net.on_reverse_proxy = false;
 
     cfg
 }
@@ -124,7 +124,7 @@ pub fn ephemeral_mode_private_whitelisted() -> Configuration {
 pub fn ephemeral_with_external_ip(ip: IpAddr) -> Configuration {
     let mut cfg = ephemeral();
 
-    cfg.core.external_ip = Some(ip);
+    cfg.core.net.external_ip = Some(ip);
 
     cfg
 }
diff --git a/src/core/mod.rs b/src/core/mod.rs
index c5171ab58..f4eb2c335 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -320,16 +320,18 @@
 //! announce_interval = 120
 //! min_announce_interval = 120
 //! max_peer_timeout = 900
-//! on_reverse_proxy = false
-//! external_ip = "2.137.87.41"
 //! tracker_usage_statistics = true
 //! persistent_torrent_completed_stat = true
 //! inactive_peer_cleanup_interval = 600
 //! remove_peerless_torrents = false
 //!
-//!   [core.database]
-//!   driver = "Sqlite3"
-//!   path = "./storage/tracker/lib/database/sqlite3.db"
+//! [core.database]
+//! driver = "Sqlite3"
+//! path = "./storage/tracker/lib/database/sqlite3.db"
+//!
+//! [core.net]
+//! on_reverse_proxy = false
+//! external_ip = "2.137.87.41"
 //! ```
 //!
 //! Refer to the [`configuration` module documentation](https://docs.rs/torrust-tracker-configuration) to get more information about all options.
@@ -564,13 +566,13 @@ impl Tracker {
             stats_event_sender,
             stats_repository,
             database,
-            external_ip: config.external_ip,
+            external_ip: config.net.external_ip,
             policy: TrackerPolicy::new(
                 config.remove_peerless_torrents,
                 config.max_peer_timeout,
                 config.persistent_torrent_completed_stat,
             ),
-            on_reverse_proxy: config.on_reverse_proxy,
+            on_reverse_proxy: config.net.on_reverse_proxy,
         })
     }
 
diff --git a/src/lib.rs b/src/lib.rs
index b94da4717..bf9257123 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -172,12 +172,10 @@
 //!
 //! [core]
 //! announce_interval = 120
-//! external_ip = "0.0.0.0"
 //! inactive_peer_cleanup_interval = 600
 //! max_peer_timeout = 900
 //! min_announce_interval = 120
 //! mode = "public"
-//! on_reverse_proxy = false
 //! persistent_torrent_completed_stat = false
 //! remove_peerless_torrents = true
 //! tracker_usage_statistics = true
@@ -186,6 +184,10 @@
 //!   driver = "Sqlite3"
 //!   path = "./storage/tracker/lib/database/sqlite3.db"
 //!
+//!   [core.net]
+//!   external_ip = "0.0.0.0"
+//!   on_reverse_proxy = false
+//!
 //! [[udp_trackers]]
 //! bind_address = "0.0.0.0:6969"
 //! enabled = false
diff --git a/src/servers/http/v1/services/announce.rs b/src/servers/http/v1/services/announce.rs
index 253140fbc..eee5e4688 100644
--- a/src/servers/http/v1/services/announce.rs
+++ b/src/servers/http/v1/services/announce.rs
@@ -151,7 +151,7 @@ mod tests {
 
         fn tracker_with_an_ipv6_external_ip(stats_event_sender: Box<dyn statistics::EventSender>) -> Tracker {
             let mut configuration = configuration::ephemeral();
-            configuration.core.external_ip = Some(IpAddr::V6(Ipv6Addr::new(
+            configuration.core.net.external_ip = Some(IpAddr::V6(Ipv6Addr::new(
                 0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969,
             )));
 
diff --git a/src/servers/udp/handlers.rs b/src/servers/udp/handlers.rs
index 858d6606c..36825f084 100644
--- a/src/servers/udp/handlers.rs
+++ b/src/servers/udp/handlers.rs
@@ -425,7 +425,7 @@ mod tests {
         }
 
         pub fn with_external_ip(mut self, external_ip: &str) -> Self {
-            self.configuration.core.external_ip = Some(external_ip.to_owned().parse().expect("valid IP address"));
+            self.configuration.core.net.external_ip = Some(external_ip.to_owned().parse().expect("valid IP address"));
             self
         }
 

From fc046e0441302c3af8db3a1b1173d38e4383369e Mon Sep 17 00:00:00 2001
From: Jose Celano <josecelano@gmail.com>
Date: Mon, 17 Jun 2024 17:21:03 +0100
Subject: [PATCH 5/9] feat!: [#878] extract announce_policy section in core
 config section

---
 packages/configuration/src/lib.rs     |  4 +++-
 packages/configuration/src/v1/core.rs | 21 +++++++++------------
 packages/configuration/src/v1/mod.rs  | 12 ++++++++----
 src/core/mod.rs                       | 14 ++++++++------
 src/lib.rs                            | 18 ++++++++++--------
 5 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/packages/configuration/src/lib.rs b/packages/configuration/src/lib.rs
index 46ece96ab..3b719f742 100644
--- a/packages/configuration/src/lib.rs
+++ b/packages/configuration/src/lib.rs
@@ -86,7 +86,7 @@ impl Info {
 }
 
 /// Announce policy
-#[derive(PartialEq, Eq, Debug, Clone, Copy, Constructor)]
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone, Copy, Constructor)]
 pub struct AnnouncePolicy {
     /// Interval in seconds that the client should wait between sending regular
     /// announce requests to the tracker.
@@ -99,6 +99,7 @@ pub struct AnnouncePolicy {
     /// client's initial request. It serves as a guideline for clients to know
     /// how often they should contact the tracker for updates on the peer list,
     /// while ensuring that the tracker is not overwhelmed with requests.
+    #[serde(default = "AnnouncePolicy::default_interval")]
     pub interval: u32,
 
     /// Minimum announce interval. Clients must not reannounce more frequently
@@ -112,6 +113,7 @@ pub struct AnnouncePolicy {
     /// value to prevent sending too many requests in a short period, which
     /// could lead to excessive load on the tracker or even getting banned by
     /// the tracker for not adhering to the rules.
+    #[serde(default = "AnnouncePolicy::default_interval_min")]
     pub interval_min: u32,
 }
 
diff --git a/packages/configuration/src/v1/core.rs b/packages/configuration/src/v1/core.rs
index 5d8ab0b33..266da21ed 100644
--- a/packages/configuration/src/v1/core.rs
+++ b/packages/configuration/src/v1/core.rs
@@ -12,14 +12,6 @@ pub struct Core {
     #[serde(default = "Core::default_mode")]
     pub mode: TrackerMode,
 
-    /// See [`AnnouncePolicy::interval`]
-    #[serde(default = "AnnouncePolicy::default_interval")]
-    pub announce_interval: u32,
-
-    /// See [`AnnouncePolicy::interval_min`]
-    #[serde(default = "AnnouncePolicy::default_interval_min")]
-    pub min_announce_interval: u32,
-
     /// Weather the tracker should collect statistics about tracker usage.
     /// If enabled, the tracker will collect statistics like the number of
     /// connections handled, the number of announce requests handled, etc.
@@ -53,6 +45,10 @@ pub struct Core {
     #[serde(default = "Core::default_remove_peerless_torrents")]
     pub remove_peerless_torrents: bool,
 
+    // Announce policy configuration.
+    #[serde(default = "Core::default_announce_policy")]
+    pub announce_policy: AnnouncePolicy,
+
     // Database configuration.
     #[serde(default = "Core::default_database")]
     pub database: Database,
@@ -64,17 +60,14 @@ pub struct Core {
 
 impl Default for Core {
     fn default() -> Self {
-        let announce_policy = AnnouncePolicy::default();
-
         Self {
             mode: Self::default_mode(),
-            announce_interval: announce_policy.interval,
-            min_announce_interval: announce_policy.interval_min,
             max_peer_timeout: Self::default_max_peer_timeout(),
             tracker_usage_statistics: Self::default_tracker_usage_statistics(),
             persistent_torrent_completed_stat: Self::default_persistent_torrent_completed_stat(),
             inactive_peer_cleanup_interval: Self::default_inactive_peer_cleanup_interval(),
             remove_peerless_torrents: Self::default_remove_peerless_torrents(),
+            announce_policy: Self::default_announce_policy(),
             database: Self::default_database(),
             net: Self::default_network(),
         }
@@ -106,6 +99,10 @@ impl Core {
         true
     }
 
+    fn default_announce_policy() -> AnnouncePolicy {
+        AnnouncePolicy::default()
+    }
+
     fn default_database() -> Database {
         Database::default()
     }
diff --git a/packages/configuration/src/v1/mod.rs b/packages/configuration/src/v1/mod.rs
index d96e1335c..d2f2a3012 100644
--- a/packages/configuration/src/v1/mod.rs
+++ b/packages/configuration/src/v1/mod.rs
@@ -198,14 +198,16 @@
 //!
 //! [core]
 //! mode = "public"
-//! announce_interval = 120
-//! min_announce_interval = 120
 //! tracker_usage_statistics = true
 //! persistent_torrent_completed_stat = false
 //! max_peer_timeout = 900
 //! inactive_peer_cleanup_interval = 600
 //! remove_peerless_torrents = true
 //!
+//! [core.announce_policy]
+//! interval = 120
+//! interval_min = 120
+//!
 //! [core.database]
 //! driver = "Sqlite3"
 //! path = "./storage/tracker/lib/database/sqlite3.db"
@@ -388,14 +390,16 @@ mod tests {
 
                                 [core]
                                 mode = "public"
-                                announce_interval = 120
-                                min_announce_interval = 120
                                 tracker_usage_statistics = true
                                 persistent_torrent_completed_stat = false
                                 max_peer_timeout = 900
                                 inactive_peer_cleanup_interval = 600
                                 remove_peerless_torrents = true
 
+                                [core.announce_policy]
+                                interval = 120
+                                interval_min = 120
+
                                 [core.database]
                                 driver = "Sqlite3"
                                 path = "./storage/tracker/lib/database/sqlite3.db"
diff --git a/src/core/mod.rs b/src/core/mod.rs
index f4eb2c335..77f7099af 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -113,10 +113,10 @@
 //! }
 //!
 //! // Core tracker configuration
-//! pub struct Configuration {
+//! pub struct AnnounceInterval {
 //!     // ...
-//!     pub announce_interval: u32, // Interval in seconds that the client should wait between sending regular announce requests to the tracker
-//!     pub min_announce_interval: u32, // Minimum announce interval. Clients must not reannounce more frequently than this
+//!     pub interval: u32, // Interval in seconds that the client should wait between sending regular announce requests to the tracker
+//!     pub interval_min: u32, // Minimum announce interval. Clients must not reannounce more frequently than this
 //!     // ...
 //! }
 //! ```
@@ -317,14 +317,16 @@
 //!
 //! [core]
 //! mode = "public"
-//! announce_interval = 120
-//! min_announce_interval = 120
 //! max_peer_timeout = 900
 //! tracker_usage_statistics = true
 //! persistent_torrent_completed_stat = true
 //! inactive_peer_cleanup_interval = 600
 //! remove_peerless_torrents = false
 //!
+//! [core.announce_policy]
+//! interval = 120
+//! interval_min = 120
+//!
 //! [core.database]
 //! driver = "Sqlite3"
 //! path = "./storage/tracker/lib/database/sqlite3.db"
@@ -558,7 +560,7 @@ impl Tracker {
 
         Ok(Tracker {
             //config,
-            announce_policy: AnnouncePolicy::new(config.announce_interval, config.min_announce_interval),
+            announce_policy: config.announce_policy,
             mode,
             keys: tokio::sync::RwLock::new(std::collections::HashMap::new()),
             whitelist: tokio::sync::RwLock::new(std::collections::HashSet::new()),
diff --git a/src/lib.rs b/src/lib.rs
index bf9257123..5c0fd4b56 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -171,22 +171,24 @@
 //! log_level = "info"
 //!
 //! [core]
-//! announce_interval = 120
 //! inactive_peer_cleanup_interval = 600
 //! max_peer_timeout = 900
-//! min_announce_interval = 120
 //! mode = "public"
 //! persistent_torrent_completed_stat = false
 //! remove_peerless_torrents = true
 //! tracker_usage_statistics = true
 //!
-//!   [core.database]
-//!   driver = "Sqlite3"
-//!   path = "./storage/tracker/lib/database/sqlite3.db"
+//! [core.announce_policy]
+//! interval = 120
+//! interval_min = 120
 //!
-//!   [core.net]
-//!   external_ip = "0.0.0.0"
-//!   on_reverse_proxy = false
+//! [core.database]
+//! driver = "Sqlite3"
+//! path = "./storage/tracker/lib/database/sqlite3.db"
+//!
+//! [core.net]
+//! external_ip = "0.0.0.0"
+//! on_reverse_proxy = false
 //!
 //! [[udp_trackers]]
 //! bind_address = "0.0.0.0:6969"

From 7b2f75724494c883c8e0d6faae9153c4ab47a562 Mon Sep 17 00:00:00 2001
From: Jose Celano <josecelano@gmail.com>
Date: Mon, 17 Jun 2024 18:19:57 +0100
Subject: [PATCH 6/9] feat!: [#878] extract tracker_policy section in core
 config section

---
 packages/configuration/src/lib.rs             | 44 ++++++++++++++++++-
 packages/configuration/src/v1/core.rs         | 40 +++--------------
 packages/configuration/src/v1/mod.rs          | 12 +++--
 .../torrent-repository/tests/entry/mod.rs     |  8 ++--
 .../tests/repository/mod.rs                   |  8 ++--
 src/core/mod.rs                               | 16 +++----
 src/lib.rs                                    |  6 ++-
 7 files changed, 76 insertions(+), 58 deletions(-)

diff --git a/packages/configuration/src/lib.rs b/packages/configuration/src/lib.rs
index 3b719f742..594a283db 100644
--- a/packages/configuration/src/lib.rs
+++ b/packages/configuration/src/lib.rs
@@ -37,11 +37,51 @@ pub type HealthCheckApi = v1::health_check_api::HealthCheckApi;
 
 pub type AccessTokens = HashMap<String, String>;
 
-#[derive(Copy, Clone, Debug, PartialEq, Constructor)]
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone, Constructor)]
 pub struct TrackerPolicy {
-    pub remove_peerless_torrents: bool,
+    // Cleanup job configuration
+    /// Maximum time in seconds that a peer can be inactive before being
+    /// considered an inactive peer. If a peer is inactive for more than this
+    /// time, it will be removed from the torrent peer list.
+    #[serde(default = "TrackerPolicy::default_max_peer_timeout")]
     pub max_peer_timeout: u32,
+
+    /// If enabled the tracker will persist the number of completed downloads.
+    /// That's how many times a torrent has been downloaded completely.
+    #[serde(default = "TrackerPolicy::default_persistent_torrent_completed_stat")]
     pub persistent_torrent_completed_stat: bool,
+
+    /// If enabled, the tracker will remove torrents that have no peers.
+    /// The clean up torrent job runs every `inactive_peer_cleanup_interval`
+    /// seconds and it removes inactive peers. Eventually, the peer list of a
+    /// torrent could be empty and the torrent will be removed if this option is
+    /// enabled.
+    #[serde(default = "TrackerPolicy::default_remove_peerless_torrents")]
+    pub remove_peerless_torrents: bool,
+}
+
+impl Default for TrackerPolicy {
+    fn default() -> Self {
+        Self {
+            max_peer_timeout: Self::default_max_peer_timeout(),
+            persistent_torrent_completed_stat: Self::default_persistent_torrent_completed_stat(),
+            remove_peerless_torrents: Self::default_remove_peerless_torrents(),
+        }
+    }
+}
+
+impl TrackerPolicy {
+    fn default_max_peer_timeout() -> u32 {
+        900
+    }
+
+    fn default_persistent_torrent_completed_stat() -> bool {
+        false
+    }
+
+    fn default_remove_peerless_torrents() -> bool {
+        true
+    }
 }
 
 /// Information required for loading config
diff --git a/packages/configuration/src/v1/core.rs b/packages/configuration/src/v1/core.rs
index 266da21ed..49fdf2a80 100644
--- a/packages/configuration/src/v1/core.rs
+++ b/packages/configuration/src/v1/core.rs
@@ -3,7 +3,7 @@ use torrust_tracker_primitives::TrackerMode;
 
 use super::network::Network;
 use crate::v1::database::Database;
-use crate::AnnouncePolicy;
+use crate::{AnnouncePolicy, TrackerPolicy};
 
 #[allow(clippy::struct_excessive_bools)]
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
@@ -20,30 +20,14 @@ pub struct Core {
     #[serde(default = "Core::default_tracker_usage_statistics")]
     pub tracker_usage_statistics: bool,
 
-    /// If enabled the tracker will persist the number of completed downloads.
-    /// That's how many times a torrent has been downloaded completely.
-    #[serde(default = "Core::default_persistent_torrent_completed_stat")]
-    pub persistent_torrent_completed_stat: bool,
-
-    // Cleanup job configuration
-    /// Maximum time in seconds that a peer can be inactive before being
-    /// considered an inactive peer. If a peer is inactive for more than this
-    /// time, it will be removed from the torrent peer list.
-    #[serde(default = "Core::default_max_peer_timeout")]
-    pub max_peer_timeout: u32,
-
     /// Interval in seconds that the cleanup job will run to remove inactive
     /// peers from the torrent peer list.
     #[serde(default = "Core::default_inactive_peer_cleanup_interval")]
     pub inactive_peer_cleanup_interval: u64,
 
-    /// If enabled, the tracker will remove torrents that have no peers.
-    /// The clean up torrent job runs every `inactive_peer_cleanup_interval`
-    /// seconds and it removes inactive peers. Eventually, the peer list of a
-    /// torrent could be empty and the torrent will be removed if this option is
-    /// enabled.
-    #[serde(default = "Core::default_remove_peerless_torrents")]
-    pub remove_peerless_torrents: bool,
+    // Tracker policy configuration.
+    #[serde(default = "Core::default_tracker_policy")]
+    pub tracker_policy: TrackerPolicy,
 
     // Announce policy configuration.
     #[serde(default = "Core::default_announce_policy")]
@@ -62,11 +46,9 @@ impl Default for Core {
     fn default() -> Self {
         Self {
             mode: Self::default_mode(),
-            max_peer_timeout: Self::default_max_peer_timeout(),
             tracker_usage_statistics: Self::default_tracker_usage_statistics(),
-            persistent_torrent_completed_stat: Self::default_persistent_torrent_completed_stat(),
             inactive_peer_cleanup_interval: Self::default_inactive_peer_cleanup_interval(),
-            remove_peerless_torrents: Self::default_remove_peerless_torrents(),
+            tracker_policy: Self::default_tracker_policy(),
             announce_policy: Self::default_announce_policy(),
             database: Self::default_database(),
             net: Self::default_network(),
@@ -83,20 +65,12 @@ impl Core {
         true
     }
 
-    fn default_persistent_torrent_completed_stat() -> bool {
-        false
-    }
-
-    fn default_max_peer_timeout() -> u32 {
-        900
-    }
-
     fn default_inactive_peer_cleanup_interval() -> u64 {
         600
     }
 
-    fn default_remove_peerless_torrents() -> bool {
-        true
+    fn default_tracker_policy() -> TrackerPolicy {
+        TrackerPolicy::default()
     }
 
     fn default_announce_policy() -> AnnouncePolicy {
diff --git a/packages/configuration/src/v1/mod.rs b/packages/configuration/src/v1/mod.rs
index d2f2a3012..19499cd4a 100644
--- a/packages/configuration/src/v1/mod.rs
+++ b/packages/configuration/src/v1/mod.rs
@@ -199,9 +199,11 @@
 //! [core]
 //! mode = "public"
 //! tracker_usage_statistics = true
-//! persistent_torrent_completed_stat = false
-//! max_peer_timeout = 900
 //! inactive_peer_cleanup_interval = 600
+//!
+//! [core.tracker_policy]
+//! max_peer_timeout = 900
+//! persistent_torrent_completed_stat = false
 //! remove_peerless_torrents = true
 //!
 //! [core.announce_policy]
@@ -391,9 +393,11 @@ mod tests {
                                 [core]
                                 mode = "public"
                                 tracker_usage_statistics = true
-                                persistent_torrent_completed_stat = false
-                                max_peer_timeout = 900
                                 inactive_peer_cleanup_interval = 600
+
+                                [core.tracker_policy]
+                                max_peer_timeout = 900
+                                persistent_torrent_completed_stat = false
                                 remove_peerless_torrents = true
 
                                 [core.announce_policy]
diff --git a/packages/torrent-repository/tests/entry/mod.rs b/packages/torrent-repository/tests/entry/mod.rs
index 3b9f3e3ad..fdbe211b3 100644
--- a/packages/torrent-repository/tests/entry/mod.rs
+++ b/packages/torrent-repository/tests/entry/mod.rs
@@ -43,22 +43,22 @@ fn rw_lock_parking_lot() -> Torrent {
 
 #[fixture]
 fn policy_none() -> TrackerPolicy {
-    TrackerPolicy::new(false, 0, false)
+    TrackerPolicy::new(0, false, false)
 }
 
 #[fixture]
 fn policy_persist() -> TrackerPolicy {
-    TrackerPolicy::new(false, 0, true)
+    TrackerPolicy::new(0, true, false)
 }
 
 #[fixture]
 fn policy_remove() -> TrackerPolicy {
-    TrackerPolicy::new(true, 0, false)
+    TrackerPolicy::new(0, false, true)
 }
 
 #[fixture]
 fn policy_remove_persist() -> TrackerPolicy {
-    TrackerPolicy::new(true, 0, true)
+    TrackerPolicy::new(0, true, true)
 }
 
 pub enum Makes {
diff --git a/packages/torrent-repository/tests/repository/mod.rs b/packages/torrent-repository/tests/repository/mod.rs
index dd9893cc9..b10f4a64a 100644
--- a/packages/torrent-repository/tests/repository/mod.rs
+++ b/packages/torrent-repository/tests/repository/mod.rs
@@ -220,22 +220,22 @@ fn paginated_limit_one_offset_one() -> Pagination {
 
 #[fixture]
 fn policy_none() -> TrackerPolicy {
-    TrackerPolicy::new(false, 0, false)
+    TrackerPolicy::new(0, false, false)
 }
 
 #[fixture]
 fn policy_persist() -> TrackerPolicy {
-    TrackerPolicy::new(false, 0, true)
+    TrackerPolicy::new(0, true, false)
 }
 
 #[fixture]
 fn policy_remove() -> TrackerPolicy {
-    TrackerPolicy::new(true, 0, false)
+    TrackerPolicy::new(0, false, true)
 }
 
 #[fixture]
 fn policy_remove_persist() -> TrackerPolicy {
-    TrackerPolicy::new(true, 0, true)
+    TrackerPolicy::new(0, true, true)
 }
 
 #[rstest]
diff --git a/src/core/mod.rs b/src/core/mod.rs
index 77f7099af..bd7ce4883 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -317,11 +317,13 @@
 //!
 //! [core]
 //! mode = "public"
-//! max_peer_timeout = 900
 //! tracker_usage_statistics = true
-//! persistent_torrent_completed_stat = true
 //! inactive_peer_cleanup_interval = 600
-//! remove_peerless_torrents = false
+//!
+//! [core.tracker_policy]
+//! max_peer_timeout = 900
+//! persistent_torrent_completed_stat = false
+//! remove_peerless_torrents = true
 //!
 //! [core.announce_policy]
 //! interval = 120
@@ -569,11 +571,7 @@ impl Tracker {
             stats_repository,
             database,
             external_ip: config.net.external_ip,
-            policy: TrackerPolicy::new(
-                config.remove_peerless_torrents,
-                config.max_peer_timeout,
-                config.persistent_torrent_completed_stat,
-            ),
+            policy: config.tracker_policy.clone(),
             on_reverse_proxy: config.net.on_reverse_proxy,
         })
     }
@@ -1043,7 +1041,7 @@ mod tests {
 
         pub fn tracker_persisting_torrents_in_database() -> Tracker {
             let mut configuration = configuration::ephemeral();
-            configuration.core.persistent_torrent_completed_stat = true;
+            configuration.core.tracker_policy.persistent_torrent_completed_stat = true;
             tracker_factory(&configuration)
         }
 
diff --git a/src/lib.rs b/src/lib.rs
index 5c0fd4b56..c059f6df7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -172,11 +172,13 @@
 //!
 //! [core]
 //! inactive_peer_cleanup_interval = 600
-//! max_peer_timeout = 900
 //! mode = "public"
+//! tracker_usage_statistics = true
+//!
+//! [core.tracker_policy]
+//! max_peer_timeout = 900
 //! persistent_torrent_completed_stat = false
 //! remove_peerless_torrents = true
-//! tracker_usage_statistics = true
 //!
 //! [core.announce_policy]
 //! interval = 120

From c5cc9fd6a461ad439fb81b405ecbe652d82fd4fb Mon Sep 17 00:00:00 2001
From: Jose Celano <josecelano@gmail.com>
Date: Mon, 17 Jun 2024 19:34:56 +0100
Subject: [PATCH 7/9] feat: [#878] extract tsl_config in toml config

TSL configuration for HTTP trackers and the Tracker API is still
optional. However, when it's provided is enabled. The `ssl_enabled`
field was removed. You can remove the whole `tsl_config` to disable TSL.

If you want to kee a copy in the TOML file you can just comment the
lines.

```toml
[[http_trackers]]
...

[http_trackers.tsl_config]
ssl_cert_path = "./storage/tracker/lib/tls/localhost.crt"
ssl_key_path = "./storage/tracker/lib/tls/localhost.key"

[http_api]
...

[http_api.tsl_config]
ssl_cert_path = "./storage/tracker/lib/tls/localhost.crt"
ssl_key_path = "./storage/tracker/lib/tls/localhost.key"
```
---
 Cargo.toml                                    |  2 +-
 docs/containers.md                            | 23 +++---
 packages/configuration/Cargo.toml             |  2 +-
 packages/configuration/src/lib.rs             | 17 +++--
 packages/configuration/src/v1/http_tracker.rs | 19 +++--
 packages/configuration/src/v1/mod.rs          | 20 ++----
 packages/configuration/src/v1/tracker_api.rs  | 19 +++--
 .../config/tracker.container.mysql.toml       |  8 +--
 .../config/tracker.container.sqlite3.toml     |  8 ---
 .../config/tracker.e2e.container.sqlite3.toml |  6 --
 src/bootstrap/jobs/http_tracker.rs            |  2 +-
 src/bootstrap/jobs/mod.rs                     | 70 +++++++++----------
 src/bootstrap/jobs/tracker_apis.rs            |  2 +-
 src/lib.rs                                    |  9 ---
 src/servers/apis/mod.rs                       | 12 ++--
 src/servers/apis/server.rs                    |  2 +-
 src/servers/http/server.rs                    |  2 +-
 tests/servers/api/environment.rs              |  2 +-
 tests/servers/http/environment.rs             |  2 +-
 19 files changed, 92 insertions(+), 135 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 072a21a7e..c22c3dd45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ axum = { version = "0", features = ["macros"] }
 axum-client-ip = "0"
 axum-extra = { version = "0", features = ["query"] }
 axum-server = { version = "0", features = ["tls-rustls"] }
-camino = { version = "1.1.6", features = ["serde"] }
+camino = { version = "1.1.6", features = ["serde", "serde1"] }
 chrono = { version = "0", default-features = false, features = ["clock"] }
 clap = { version = "4", features = ["derive", "env"] }
 crossbeam-skiplist = "0.1"
diff --git a/docs/containers.md b/docs/containers.md
index 1a1ea2f0d..82c67c26e 100644
--- a/docs/containers.md
+++ b/docs/containers.md
@@ -330,24 +330,23 @@ The storage folder must contain your certificates:
 
 ```s
 storage/tracker/lib/tls
-    ├── localhost.crt
-    └── localhost.key
+                    ├── localhost.crt
+                    └── localhost.key
+storage/http_api/lib/tls
+                     ├── localhost.crt
+                     └── localhost.key
 ```
 
 You have not enabled it in your `tracker.toml` file:
 
 ```toml
+[http_trackers.tsl_config]
+ssl_cert_path = "./storage/tracker/lib/tls/localhost.crt"
+ssl_key_path = "./storage/tracker/lib/tls/localhost.key"
 
-[[http_trackers]]
-# ...
-ssl_enabled = true
-# ...
-
-[http_api]
-# ...
-ssl_enabled = true
-# ...
-
+[http_api.tsl_config]
+ssl_cert_path = "./storage/http_api/lib/tls/localhost.crt"
+ssl_key_path = "./storage/http_api/lib/tls/localhost.key"
 ```
 
 > NOTE: you can enable it independently for each HTTP tracker or the API.
diff --git a/packages/configuration/Cargo.toml b/packages/configuration/Cargo.toml
index bac2132d5..53e4e4cfa 100644
--- a/packages/configuration/Cargo.toml
+++ b/packages/configuration/Cargo.toml
@@ -15,7 +15,7 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-camino = { version = "1.1.6", features = ["serde"] }
+camino = { version = "1.1.6", features = ["serde", "serde1"] }
 derive_more = "0"
 figment = { version = "0.10.18", features = ["env", "test", "toml"] }
 serde = { version = "1", features = ["derive"] }
diff --git a/packages/configuration/src/lib.rs b/packages/configuration/src/lib.rs
index 594a283db..c8c91443a 100644
--- a/packages/configuration/src/lib.rs
+++ b/packages/configuration/src/lib.rs
@@ -13,7 +13,7 @@ use std::sync::Arc;
 use camino::Utf8PathBuf;
 use derive_more::Constructor;
 use serde::{Deserialize, Serialize};
-use serde_with::{serde_as, NoneAsEmptyString};
+use serde_with::serde_as;
 use thiserror::Error;
 use torrust_tracker_located_error::{DynError, LocatedError};
 
@@ -215,24 +215,23 @@ impl From<figment::Error> for Error {
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone, Default)]
 pub struct TslConfig {
     /// Path to the SSL certificate file.
-    #[serde_as(as = "NoneAsEmptyString")]
     #[serde(default = "TslConfig::default_ssl_cert_path")]
-    pub ssl_cert_path: Option<Utf8PathBuf>,
+    pub ssl_cert_path: Utf8PathBuf,
+
     /// Path to the SSL key file.
-    #[serde_as(as = "NoneAsEmptyString")]
     #[serde(default = "TslConfig::default_ssl_key_path")]
-    pub ssl_key_path: Option<Utf8PathBuf>,
+    pub ssl_key_path: Utf8PathBuf,
 }
 
 impl TslConfig {
     #[allow(clippy::unnecessary_wraps)]
-    fn default_ssl_cert_path() -> Option<Utf8PathBuf> {
-        Some(Utf8PathBuf::new())
+    fn default_ssl_cert_path() -> Utf8PathBuf {
+        Utf8PathBuf::new()
     }
 
     #[allow(clippy::unnecessary_wraps)]
-    fn default_ssl_key_path() -> Option<Utf8PathBuf> {
-        Some(Utf8PathBuf::new())
+    fn default_ssl_key_path() -> Utf8PathBuf {
+        Utf8PathBuf::new()
     }
 }
 
diff --git a/packages/configuration/src/v1/http_tracker.rs b/packages/configuration/src/v1/http_tracker.rs
index b1fe1437b..fed2282a5 100644
--- a/packages/configuration/src/v1/http_tracker.rs
+++ b/packages/configuration/src/v1/http_tracker.rs
@@ -12,19 +12,17 @@ pub struct HttpTracker {
     /// Weather the HTTP tracker is enabled or not.
     #[serde(default = "HttpTracker::default_enabled")]
     pub enabled: bool,
+
     /// The address the tracker will bind to.
     /// The format is `ip:port`, for example `0.0.0.0:6969`. If you want to
     /// listen to all interfaces, use `0.0.0.0`. If you want the operating
     /// system to choose a random port, use port `0`.
     #[serde(default = "HttpTracker::default_bind_address")]
     pub bind_address: SocketAddr,
-    /// Weather the HTTP tracker will use SSL or not.
-    #[serde(default = "HttpTracker::default_ssl_enabled")]
-    pub ssl_enabled: bool,
-    /// TSL config. Only used if `ssl_enabled` is true.
-    #[serde(flatten)]
-    #[serde(default = "TslConfig::default")]
-    pub tsl_config: TslConfig,
+
+    /// TSL config.
+    #[serde(default = "HttpTracker::default_tsl_config")]
+    pub tsl_config: Option<TslConfig>,
 }
 
 impl Default for HttpTracker {
@@ -32,8 +30,7 @@ impl Default for HttpTracker {
         Self {
             enabled: Self::default_enabled(),
             bind_address: Self::default_bind_address(),
-            ssl_enabled: Self::default_ssl_enabled(),
-            tsl_config: TslConfig::default(),
+            tsl_config: Self::default_tsl_config(),
         }
     }
 }
@@ -47,7 +44,7 @@ impl HttpTracker {
         SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 7070)
     }
 
-    fn default_ssl_enabled() -> bool {
-        false
+    fn default_tsl_config() -> Option<TslConfig> {
+        None
     }
 }
diff --git a/packages/configuration/src/v1/mod.rs b/packages/configuration/src/v1/mod.rs
index 19499cd4a..603be85d2 100644
--- a/packages/configuration/src/v1/mod.rs
+++ b/packages/configuration/src/v1/mod.rs
@@ -176,14 +176,16 @@
 //!
 //! ```s
 //! [[http_trackers]]
-//! enabled = true
 //! ...
+//!
+//! [http_trackers.tsl_config]
 //! ssl_cert_path = "./storage/tracker/lib/tls/localhost.crt"
 //! ssl_key_path = "./storage/tracker/lib/tls/localhost.key"
 //!
 //! [http_api]
-//! enabled = true
 //! ...
+//!
+//! [http_api.tsl_config]
 //! ssl_cert_path = "./storage/tracker/lib/tls/localhost.crt"
 //! ssl_key_path = "./storage/tracker/lib/tls/localhost.key"
 //! ```
@@ -225,16 +227,10 @@
 //! [[http_trackers]]
 //! enabled = false
 //! bind_address = "0.0.0.0:7070"
-//! ssl_enabled = false
-//! ssl_cert_path = ""
-//! ssl_key_path = ""
 //!
 //! [http_api]
 //! enabled = true
 //! bind_address = "127.0.0.1:1212"
-//! ssl_enabled = false
-//! ssl_cert_path = ""
-//! ssl_key_path = ""
 //!
 //! [http_api.access_tokens]
 //! admin = "MyAccessToken"
@@ -419,16 +415,10 @@ mod tests {
                                 [[http_trackers]]
                                 enabled = false
                                 bind_address = "0.0.0.0:7070"
-                                ssl_enabled = false
-                                ssl_cert_path = ""
-                                ssl_key_path = ""
-
+                                
                                 [http_api]
                                 enabled = true
                                 bind_address = "127.0.0.1:1212"
-                                ssl_enabled = false
-                                ssl_cert_path = ""
-                                ssl_key_path = ""
 
                                 [http_api.access_tokens]
                                 admin = "MyAccessToken"
diff --git a/packages/configuration/src/v1/tracker_api.rs b/packages/configuration/src/v1/tracker_api.rs
index c2e3e5ee9..42794ad18 100644
--- a/packages/configuration/src/v1/tracker_api.rs
+++ b/packages/configuration/src/v1/tracker_api.rs
@@ -15,19 +15,18 @@ pub struct HttpApi {
     /// Weather the HTTP API is enabled or not.
     #[serde(default = "HttpApi::default_enabled")]
     pub enabled: bool,
+
     /// The address the tracker will bind to.
     /// The format is `ip:port`, for example `0.0.0.0:6969`. If you want to
     /// listen to all interfaces, use `0.0.0.0`. If you want the operating
     /// system to choose a random port, use port `0`.
     #[serde(default = "HttpApi::default_bind_address")]
     pub bind_address: SocketAddr,
-    /// Weather the HTTP API will use SSL or not.
-    #[serde(default = "HttpApi::default_ssl_enabled")]
-    pub ssl_enabled: bool,
+
     /// TSL config. Only used if `ssl_enabled` is true.
-    #[serde(flatten)]
-    #[serde(default = "TslConfig::default")]
-    pub tsl_config: TslConfig,
+    #[serde(default = "HttpApi::default_tsl_config")]
+    pub tsl_config: Option<TslConfig>,
+
     /// Access tokens for the HTTP API. The key is a label identifying the
     /// token and the value is the token itself. The token is used to
     /// authenticate the user. All tokens are valid for all endpoints and have
@@ -41,8 +40,7 @@ impl Default for HttpApi {
         Self {
             enabled: Self::default_enabled(),
             bind_address: Self::default_bind_address(),
-            ssl_enabled: Self::default_ssl_enabled(),
-            tsl_config: TslConfig::default(),
+            tsl_config: Self::default_tsl_config(),
             access_tokens: Self::default_access_tokens(),
         }
     }
@@ -57,8 +55,9 @@ impl HttpApi {
         SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 1212)
     }
 
-    fn default_ssl_enabled() -> bool {
-        false
+    #[allow(clippy::unnecessary_wraps)]
+    fn default_tsl_config() -> Option<TslConfig> {
+        None
     }
 
     fn default_access_tokens() -> AccessTokens {
diff --git a/share/default/config/tracker.container.mysql.toml b/share/default/config/tracker.container.mysql.toml
index 75cc57b64..70ee8b500 100644
--- a/share/default/config/tracker.container.mysql.toml
+++ b/share/default/config/tracker.container.mysql.toml
@@ -3,9 +3,5 @@ driver = "MySQL"
 path = "mysql://db_user:db_user_secret_password@mysql:3306/torrust_tracker"
 
 [[http_trackers]]
-ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
-ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
-
-[http_api]
-ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
-ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
+bind_address = "0.0.0.0:7070"
+enabled = true
diff --git a/share/default/config/tracker.container.sqlite3.toml b/share/default/config/tracker.container.sqlite3.toml
index 433e36127..f7bb6b8bb 100644
--- a/share/default/config/tracker.container.sqlite3.toml
+++ b/share/default/config/tracker.container.sqlite3.toml
@@ -1,10 +1,2 @@
 [core.database]
 path = "/var/lib/torrust/tracker/database/sqlite3.db"
-
-[[http_trackers]]
-ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
-ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
-
-[http_api]
-ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
-ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
diff --git a/share/default/config/tracker.e2e.container.sqlite3.toml b/share/default/config/tracker.e2e.container.sqlite3.toml
index b8adedefb..744d267fd 100644
--- a/share/default/config/tracker.e2e.container.sqlite3.toml
+++ b/share/default/config/tracker.e2e.container.sqlite3.toml
@@ -6,12 +6,6 @@ enabled = true
 
 [[http_trackers]]
 enabled = true
-ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
-ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
-
-[http_api]
-ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
-ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
 
 [health_check_api]
 # Must be bound to wildcard IP to be accessible from outside the container
diff --git a/src/bootstrap/jobs/http_tracker.rs b/src/bootstrap/jobs/http_tracker.rs
index e9eb6bc16..05bfe2341 100644
--- a/src/bootstrap/jobs/http_tracker.rs
+++ b/src/bootstrap/jobs/http_tracker.rs
@@ -42,7 +42,7 @@ pub async fn start_job(
     if config.enabled {
         let socket = config.bind_address;
 
-        let tls = make_rust_tls(config.ssl_enabled, &config.tsl_config)
+        let tls = make_rust_tls(&config.tsl_config)
             .await
             .map(|tls| tls.expect("it should have a valid http tracker tls configuration"));
 
diff --git a/src/bootstrap/jobs/mod.rs b/src/bootstrap/jobs/mod.rs
index 316e5746c..f42a843f4 100644
--- a/src/bootstrap/jobs/mod.rs
+++ b/src/bootstrap/jobs/mod.rs
@@ -20,27 +20,33 @@ pub struct Started {
     pub address: std::net::SocketAddr,
 }
 
-pub async fn make_rust_tls(enabled: bool, tsl_config: &TslConfig) -> Option<Result<RustlsConfig, Error>> {
-    if !enabled {
-        info!("TLS not enabled");
-        return None;
-    }
+pub async fn make_rust_tls(opt_tsl_config: &Option<TslConfig>) -> Option<Result<RustlsConfig, Error>> {
+    match opt_tsl_config {
+        Some(tsl_config) => {
+            let cert = tsl_config.ssl_cert_path.clone();
+            let key = tsl_config.ssl_key_path.clone();
 
-    if let (Some(cert), Some(key)) = (tsl_config.ssl_cert_path.clone(), tsl_config.ssl_key_path.clone()) {
-        info!("Using https: cert path: {cert}.");
-        info!("Using https: key path: {key}.");
-
-        Some(
-            RustlsConfig::from_pem_file(cert, key)
-                .await
-                .map_err(|err| Error::BadTlsConfig {
-                    source: (Arc::new(err) as DynError).into(),
-                }),
-        )
-    } else {
-        Some(Err(Error::MissingTlsConfig {
-            location: Location::caller(),
-        }))
+            if !cert.exists() || !key.exists() {
+                return Some(Err(Error::MissingTlsConfig {
+                    location: Location::caller(),
+                }));
+            }
+
+            info!("Using https: cert path: {cert}.");
+            info!("Using https: key path: {key}.");
+
+            Some(
+                RustlsConfig::from_pem_file(cert, key)
+                    .await
+                    .map_err(|err| Error::BadTlsConfig {
+                        source: (Arc::new(err) as DynError).into(),
+                    }),
+            )
+        }
+        None => {
+            info!("TLS not enabled");
+            None
+        }
     }
 }
 
@@ -54,29 +60,23 @@ mod tests {
 
     #[tokio::test]
     async fn it_should_error_on_bad_tls_config() {
-        let err = make_rust_tls(
-            true,
-            &TslConfig {
-                ssl_cert_path: Some(Utf8PathBuf::from("bad cert path")),
-                ssl_key_path: Some(Utf8PathBuf::from("bad key path")),
-            },
-        )
+        let err = make_rust_tls(&Some(TslConfig {
+            ssl_cert_path: Utf8PathBuf::from("bad cert path"),
+            ssl_key_path: Utf8PathBuf::from("bad key path"),
+        }))
         .await
         .expect("tls_was_enabled")
         .expect_err("bad_cert_and_key_files");
 
-        assert!(matches!(err, Error::BadTlsConfig { source: _ }));
+        assert!(matches!(err, Error::MissingTlsConfig { location: _ }));
     }
 
     #[tokio::test]
     async fn it_should_error_on_missing_cert_or_key_paths() {
-        let err = make_rust_tls(
-            true,
-            &TslConfig {
-                ssl_cert_path: None,
-                ssl_key_path: None,
-            },
-        )
+        let err = make_rust_tls(&Some(TslConfig {
+            ssl_cert_path: Utf8PathBuf::from(""),
+            ssl_key_path: Utf8PathBuf::from(""),
+        }))
         .await
         .expect("tls_was_enabled")
         .expect_err("missing_config");
diff --git a/src/bootstrap/jobs/tracker_apis.rs b/src/bootstrap/jobs/tracker_apis.rs
index 3c1f13255..c3b12d7a1 100644
--- a/src/bootstrap/jobs/tracker_apis.rs
+++ b/src/bootstrap/jobs/tracker_apis.rs
@@ -63,7 +63,7 @@ pub async fn start_job(
     if config.enabled {
         let bind_to = config.bind_address;
 
-        let tls = make_rust_tls(config.ssl_enabled, &config.tsl_config)
+        let tls = make_rust_tls(&config.tsl_config)
             .await
             .map(|tls| tls.expect("it should have a valid tracker api tls configuration"));
 
diff --git a/src/lib.rs b/src/lib.rs
index c059f6df7..7f8c70a47 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -199,16 +199,10 @@
 //! [[http_trackers]]
 //! bind_address = "0.0.0.0:7070"
 //! enabled = false
-//! ssl_cert_path = ""
-//! ssl_enabled = false
-//! ssl_key_path = ""
 //!
 //! [http_api]
 //! bind_address = "127.0.0.1:1212"
 //! enabled = true
-//! ssl_cert_path = ""
-//! ssl_enabled = false
-//! ssl_key_path = ""
 //!
 //! [http_api.access_tokens]
 //! admin = "MyAccessToken"
@@ -261,9 +255,6 @@
 //! [http_api]
 //! enabled = true
 //! bind_address = "127.0.0.1:1212"
-//! ssl_enabled = false
-//! ssl_cert_path = ""
-//! ssl_key_path = ""
 //! ```
 //!
 //! By default it's enabled on port `1212`. You also need to add access tokens in the configuration:
diff --git a/src/servers/apis/mod.rs b/src/servers/apis/mod.rs
index 47d40c654..02b93efa6 100644
--- a/src/servers/apis/mod.rs
+++ b/src/servers/apis/mod.rs
@@ -27,7 +27,8 @@
 //! [http_api]
 //! enabled = true
 //! bind_address = "0.0.0.0:1212"
-//! ssl_enabled = false
+//!
+//! [http_api.tsl_config]
 //! ssl_cert_path = "./storage/tracker/lib/tls/localhost.crt"
 //! ssl_key_path = "./storage/tracker/lib/tls/localhost.key"
 //!
@@ -106,16 +107,15 @@
 //!
 //! # Setup SSL (optional)
 //!
-//! The API server supports SSL. You can enable it by setting the
-//! [`ssl_enabled`](torrust_tracker_configuration::HttpApi::ssl_enabled) option
-//! to `true` in the configuration file
-//! ([`http_api`](torrust_tracker_configuration::HttpApi) section).
+//! The API server supports SSL. You can enable it by adding the `tsl_config`
+//! section to the configuration.
 //!
 //! ```toml
 //! [http_api]
 //! enabled = true
 //! bind_address = "0.0.0.0:1212"
-//! ssl_enabled = true
+//!
+//! [http_api.tsl_config]
 //! ssl_cert_path = "./storage/tracker/lib/tls/localhost.crt"
 //! ssl_key_path = "./storage/tracker/lib/tls/localhost.key"
 //!
diff --git a/src/servers/apis/server.rs b/src/servers/apis/server.rs
index 7c5b8983b..74dc89692 100644
--- a/src/servers/apis/server.rs
+++ b/src/servers/apis/server.rs
@@ -280,7 +280,7 @@ mod tests {
 
         let bind_to = config.bind_address;
 
-        let tls = make_rust_tls(config.ssl_enabled, &config.tsl_config)
+        let tls = make_rust_tls(&config.tsl_config)
             .await
             .map(|tls| tls.expect("tls config failed"));
 
diff --git a/src/servers/http/server.rs b/src/servers/http/server.rs
index 5c33fc8fa..bbe0c3cc1 100644
--- a/src/servers/http/server.rs
+++ b/src/servers/http/server.rs
@@ -239,7 +239,7 @@ mod tests {
 
         let bind_to = config.bind_address;
 
-        let tls = make_rust_tls(config.ssl_enabled, &config.tsl_config)
+        let tls = make_rust_tls(&config.tsl_config)
             .await
             .map(|tls| tls.expect("tls config failed"));
 
diff --git a/tests/servers/api/environment.rs b/tests/servers/api/environment.rs
index cacde8af9..8f84620dd 100644
--- a/tests/servers/api/environment.rs
+++ b/tests/servers/api/environment.rs
@@ -35,7 +35,7 @@ impl Environment<Stopped> {
 
         let bind_to = config.bind_address;
 
-        let tls = block_on(make_rust_tls(config.ssl_enabled, &config.tsl_config)).map(|tls| tls.expect("tls config failed"));
+        let tls = block_on(make_rust_tls(&config.tsl_config)).map(|tls| tls.expect("tls config failed"));
 
         let server = ApiServer::new(Launcher::new(bind_to, tls));
 
diff --git a/tests/servers/http/environment.rs b/tests/servers/http/environment.rs
index 61837c40f..6e80569ec 100644
--- a/tests/servers/http/environment.rs
+++ b/tests/servers/http/environment.rs
@@ -33,7 +33,7 @@ impl Environment<Stopped> {
 
         let bind_to = config.bind_address;
 
-        let tls = block_on(make_rust_tls(config.ssl_enabled, &config.tsl_config)).map(|tls| tls.expect("tls config failed"));
+        let tls = block_on(make_rust_tls(&config.tsl_config)).map(|tls| tls.expect("tls config failed"));
 
         let server = HttpServer::new(Launcher::new(bind_to, tls));
 

From 50bef25af092414b46d13ce393dacc22b4f9a2cf Mon Sep 17 00:00:00 2001
From: Jose Celano <josecelano@gmail.com>
Date: Tue, 18 Jun 2024 08:36:57 +0100
Subject: [PATCH 8/9] feat: remove ambiguous log entry

It remvoes this line:

```
2024-06-17T18:52:49.196708Z  INFO torrust_tracker::bootstrap::jobs: TLS not enabled
```

becuase it doesn't specifu which service the TSl is not enabled for.

On the other hand, the output already indicates whether the service is
runnig on HTTP or HTTPs:

```
2024-06-18T07:37:58.595692Z  INFO HTTP TRACKER: Started on: http://0.0.0.0:7070
```
---
 src/bootstrap/jobs/mod.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/bootstrap/jobs/mod.rs b/src/bootstrap/jobs/mod.rs
index f42a843f4..87a607720 100644
--- a/src/bootstrap/jobs/mod.rs
+++ b/src/bootstrap/jobs/mod.rs
@@ -44,7 +44,6 @@ pub async fn make_rust_tls(opt_tsl_config: &Option<TslConfig>) -> Option<Result<
             )
         }
         None => {
-            info!("TLS not enabled");
             None
         }
     }

From 06ad5dabe82ebef947b8b54c19ac9a74eca33335 Mon Sep 17 00:00:00 2001
From: Jose Celano <josecelano@gmail.com>
Date: Tue, 18 Jun 2024 10:11:11 +0100
Subject: [PATCH 9/9] feat!: [#878] remove enabled fields in config

By default all services are disabled. If the service section is missing
in the TOML config file it means the service is disabled.

From:

```toml
[[udp_trackers]]
enabled = false
bind_address = "0.0.0.0:6969"
```

To:

```toml
```

The `http_api` section has been disabled by default becuase there is no
way to override it to disable it, if it's enabled by default. You nned
to explicitly enabled the API now.
---
 docs/benchmarking.md                          |  4 +-
 packages/configuration/src/v1/http_tracker.rs |  9 ---
 packages/configuration/src/v1/mod.rs          | 47 ++---------
 packages/configuration/src/v1/tracker_api.rs  |  9 ---
 packages/configuration/src/v1/udp_tracker.rs  |  8 --
 packages/test-helpers/src/configuration.rs    | 39 ++++++---
 .../config/tracker.container.mysql.toml       | 16 +++-
 .../config/tracker.container.sqlite3.toml     | 14 ++++
 .../config/tracker.development.sqlite3.toml   | 10 ++-
 .../config/tracker.e2e.container.sqlite3.toml | 10 ++-
 .../config/tracker.udp.benchmarking.toml      |  5 +-
 src/app.rs                                    | 81 ++++++++++---------
 src/bootstrap/jobs/http_tracker.rs            | 21 ++---
 src/bootstrap/jobs/mod.rs                     |  4 +-
 src/bootstrap/jobs/tracker_apis.rs            | 22 ++---
 src/lib.rs                                    | 21 +----
 src/servers/apis/mod.rs                       |  2 -
 src/servers/apis/server.rs                    |  2 +-
 src/servers/http/server.rs                    |  5 +-
 src/servers/udp/server.rs                     |  3 +-
 tests/servers/api/environment.rs              |  2 +-
 tests/servers/http/environment.rs             |  7 +-
 tests/servers/udp/environment.rs              |  4 +-
 23 files changed, 156 insertions(+), 189 deletions(-)

diff --git a/docs/benchmarking.md b/docs/benchmarking.md
index 67b680fdc..ce3b69057 100644
--- a/docs/benchmarking.md
+++ b/docs/benchmarking.md
@@ -33,7 +33,7 @@ Run the tracker with UDP service enabled and other services disabled and set log
 log_level = "error"
 
 [[udp_trackers]]
-enabled = true
+bind_address = "0.0.0.0:6969"
 ```
 
 Build and run the tracker:
@@ -168,7 +168,7 @@ Run the tracker with UDP service enabled and other services disabled and set log
 log_level = "error"
 
 [[udp_trackers]]
-enabled = true
+bind_address = "0.0.0.0:6969"
 ```
 
 ```console
diff --git a/packages/configuration/src/v1/http_tracker.rs b/packages/configuration/src/v1/http_tracker.rs
index fed2282a5..42ec02bf2 100644
--- a/packages/configuration/src/v1/http_tracker.rs
+++ b/packages/configuration/src/v1/http_tracker.rs
@@ -9,10 +9,6 @@ use crate::TslConfig;
 #[serde_as]
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
 pub struct HttpTracker {
-    /// Weather the HTTP tracker is enabled or not.
-    #[serde(default = "HttpTracker::default_enabled")]
-    pub enabled: bool,
-
     /// The address the tracker will bind to.
     /// The format is `ip:port`, for example `0.0.0.0:6969`. If you want to
     /// listen to all interfaces, use `0.0.0.0`. If you want the operating
@@ -28,7 +24,6 @@ pub struct HttpTracker {
 impl Default for HttpTracker {
     fn default() -> Self {
         Self {
-            enabled: Self::default_enabled(),
             bind_address: Self::default_bind_address(),
             tsl_config: Self::default_tsl_config(),
         }
@@ -36,10 +31,6 @@ impl Default for HttpTracker {
 }
 
 impl HttpTracker {
-    fn default_enabled() -> bool {
-        false
-    }
-
     fn default_bind_address() -> SocketAddr {
         SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 7070)
     }
diff --git a/packages/configuration/src/v1/mod.rs b/packages/configuration/src/v1/mod.rs
index 603be85d2..546f55b6e 100644
--- a/packages/configuration/src/v1/mod.rs
+++ b/packages/configuration/src/v1/mod.rs
@@ -220,16 +220,7 @@
 //! external_ip = "0.0.0.0"
 //! on_reverse_proxy = false
 //!
-//! [[udp_trackers]]
-//! enabled = false
-//! bind_address = "0.0.0.0:6969"
-//!
-//! [[http_trackers]]
-//! enabled = false
-//! bind_address = "0.0.0.0:7070"
-//!
 //! [http_api]
-//! enabled = true
 //! bind_address = "127.0.0.1:1212"
 //!
 //! [http_api.access_tokens]
@@ -267,7 +258,7 @@ const CONFIG_OVERRIDE_PREFIX: &str = "TORRUST_TRACKER_CONFIG_OVERRIDE_";
 const CONFIG_OVERRIDE_SEPARATOR: &str = "__";
 
 /// Core configuration for the tracker.
-#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Default)]
 pub struct Configuration {
     /// Logging configuration
     pub logging: Logging,
@@ -278,33 +269,20 @@ pub struct Configuration {
     /// The list of UDP trackers the tracker is running. Each UDP tracker
     /// represents a UDP server that the tracker is running and it has its own
     /// configuration.
-    pub udp_trackers: Vec<UdpTracker>,
+    pub udp_trackers: Option<Vec<UdpTracker>>,
 
     /// The list of HTTP trackers the tracker is running. Each HTTP tracker
     /// represents a HTTP server that the tracker is running and it has its own
     /// configuration.
-    pub http_trackers: Vec<HttpTracker>,
+    pub http_trackers: Option<Vec<HttpTracker>>,
 
     /// The HTTP API configuration.
-    pub http_api: HttpApi,
+    pub http_api: Option<HttpApi>,
 
     /// The Health Check API configuration.
     pub health_check_api: HealthCheckApi,
 }
 
-impl Default for Configuration {
-    fn default() -> Self {
-        Self {
-            logging: Logging::default(),
-            core: Core::default(),
-            udp_trackers: vec![UdpTracker::default()],
-            http_trackers: vec![HttpTracker::default()],
-            http_api: HttpApi::default(),
-            health_check_api: HealthCheckApi::default(),
-        }
-    }
-}
-
 impl Configuration {
     /// Returns the tracker public IP address id defined in the configuration,
     /// and `None` otherwise.
@@ -408,21 +386,6 @@ mod tests {
                                 external_ip = "0.0.0.0"
                                 on_reverse_proxy = false
 
-                                [[udp_trackers]]
-                                enabled = false
-                                bind_address = "0.0.0.0:6969"
-
-                                [[http_trackers]]
-                                enabled = false
-                                bind_address = "0.0.0.0:7070"
-                                
-                                [http_api]
-                                enabled = true
-                                bind_address = "127.0.0.1:1212"
-
-                                [http_api.access_tokens]
-                                admin = "MyAccessToken"
-
                                 [health_check_api]
                                 bind_address = "127.0.0.1:1313"
         "#
@@ -556,7 +519,7 @@ mod tests {
             let configuration = Configuration::load(&info).expect("Could not load configuration from file");
 
             assert_eq!(
-                configuration.http_api.access_tokens.get("admin"),
+                configuration.http_api.unwrap().access_tokens.get("admin"),
                 Some("NewToken".to_owned()).as_ref()
             );
 
diff --git a/packages/configuration/src/v1/tracker_api.rs b/packages/configuration/src/v1/tracker_api.rs
index 42794ad18..302a4ee95 100644
--- a/packages/configuration/src/v1/tracker_api.rs
+++ b/packages/configuration/src/v1/tracker_api.rs
@@ -12,10 +12,6 @@ pub type AccessTokens = HashMap<String, String>;
 #[serde_as]
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
 pub struct HttpApi {
-    /// Weather the HTTP API is enabled or not.
-    #[serde(default = "HttpApi::default_enabled")]
-    pub enabled: bool,
-
     /// The address the tracker will bind to.
     /// The format is `ip:port`, for example `0.0.0.0:6969`. If you want to
     /// listen to all interfaces, use `0.0.0.0`. If you want the operating
@@ -38,7 +34,6 @@ pub struct HttpApi {
 impl Default for HttpApi {
     fn default() -> Self {
         Self {
-            enabled: Self::default_enabled(),
             bind_address: Self::default_bind_address(),
             tsl_config: Self::default_tsl_config(),
             access_tokens: Self::default_access_tokens(),
@@ -47,10 +42,6 @@ impl Default for HttpApi {
 }
 
 impl HttpApi {
-    fn default_enabled() -> bool {
-        true
-    }
-
     fn default_bind_address() -> SocketAddr {
         SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 1212)
     }
diff --git a/packages/configuration/src/v1/udp_tracker.rs b/packages/configuration/src/v1/udp_tracker.rs
index f8387202e..b3d420d72 100644
--- a/packages/configuration/src/v1/udp_tracker.rs
+++ b/packages/configuration/src/v1/udp_tracker.rs
@@ -4,9 +4,6 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
 pub struct UdpTracker {
-    /// Weather the UDP tracker is enabled or not.
-    #[serde(default = "UdpTracker::default_enabled")]
-    pub enabled: bool,
     /// The address the tracker will bind to.
     /// The format is `ip:port`, for example `0.0.0.0:6969`. If you want to
     /// listen to all interfaces, use `0.0.0.0`. If you want the operating
@@ -17,17 +14,12 @@ pub struct UdpTracker {
 impl Default for UdpTracker {
     fn default() -> Self {
         Self {
-            enabled: Self::default_enabled(),
             bind_address: Self::default_bind_address(),
         }
     }
 }
 
 impl UdpTracker {
-    fn default_enabled() -> bool {
-        false
-    }
-
     fn default_bind_address() -> SocketAddr {
         SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 6969)
     }
diff --git a/packages/test-helpers/src/configuration.rs b/packages/test-helpers/src/configuration.rs
index 9c6c0fe11..646617b32 100644
--- a/packages/test-helpers/src/configuration.rs
+++ b/packages/test-helpers/src/configuration.rs
@@ -2,7 +2,7 @@
 use std::env;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
 
-use torrust_tracker_configuration::{Configuration, LogLevel};
+use torrust_tracker_configuration::{Configuration, HttpApi, HttpTracker, LogLevel, UdpTracker};
 use torrust_tracker_primitives::TrackerMode;
 
 use crate::random;
@@ -33,8 +33,10 @@ pub fn ephemeral() -> Configuration {
 
     // Ephemeral socket address for API
     let api_port = 0u16;
-    config.http_api.enabled = true;
-    config.http_api.bind_address = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), api_port);
+    config.http_api = Some(HttpApi {
+        bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), api_port),
+        ..Default::default()
+    });
 
     // Ephemeral socket address for Health Check API
     let health_check_api_port = 0u16;
@@ -42,13 +44,16 @@ pub fn ephemeral() -> Configuration {
 
     // Ephemeral socket address for UDP tracker
     let udp_port = 0u16;
-    config.udp_trackers[0].enabled = true;
-    config.udp_trackers[0].bind_address = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), udp_port);
+    config.udp_trackers = Some(vec![UdpTracker {
+        bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), udp_port),
+    }]);
 
     // Ephemeral socket address for HTTP tracker
     let http_port = 0u16;
-    config.http_trackers[0].enabled = true;
-    config.http_trackers[0].bind_address = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), http_port);
+    config.http_trackers = Some(vec![HttpTracker {
+        bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), http_port),
+        tsl_config: None,
+    }]);
 
     // Ephemeral sqlite database
     let temp_directory = env::temp_dir();
@@ -137,9 +142,17 @@ pub fn ephemeral_ipv6() -> Configuration {
 
     let ipv6 = SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0)), 0);
 
-    cfg.http_api.bind_address.clone_from(&ipv6);
-    cfg.http_trackers[0].bind_address.clone_from(&ipv6);
-    cfg.udp_trackers[0].bind_address = ipv6;
+    if let Some(ref mut http_api) = cfg.http_api {
+        http_api.bind_address.clone_from(&ipv6);
+    };
+
+    if let Some(ref mut http_trackers) = cfg.http_trackers {
+        http_trackers[0].bind_address.clone_from(&ipv6);
+    }
+
+    if let Some(ref mut udp_trackers) = cfg.udp_trackers {
+        udp_trackers[0].bind_address.clone_from(&ipv6);
+    }
 
     cfg
 }
@@ -149,9 +162,9 @@ pub fn ephemeral_ipv6() -> Configuration {
 pub fn ephemeral_with_no_services() -> Configuration {
     let mut cfg = ephemeral();
 
-    cfg.http_api.enabled = false;
-    cfg.http_trackers[0].enabled = false;
-    cfg.udp_trackers[0].enabled = false;
+    cfg.http_api = None;
+    cfg.http_trackers = None;
+    cfg.udp_trackers = None;
 
     cfg
 }
diff --git a/share/default/config/tracker.container.mysql.toml b/share/default/config/tracker.container.mysql.toml
index 70ee8b500..68cc8db8a 100644
--- a/share/default/config/tracker.container.mysql.toml
+++ b/share/default/config/tracker.container.mysql.toml
@@ -2,6 +2,16 @@
 driver = "MySQL"
 path = "mysql://db_user:db_user_secret_password@mysql:3306/torrust_tracker"
 
-[[http_trackers]]
-bind_address = "0.0.0.0:7070"
-enabled = true
+# Uncomment to enable services
+
+#[[udp_trackers]]
+#bind_address = "0.0.0.0:6969"
+
+#[[http_trackers]]
+#bind_address = "0.0.0.0:7070"
+
+#[http_api]
+#bind_address = "0.0.0.0:1212"
+
+#[http_api.access_tokens]
+#admin = "MyAccessToken"
diff --git a/share/default/config/tracker.container.sqlite3.toml b/share/default/config/tracker.container.sqlite3.toml
index f7bb6b8bb..63e169a70 100644
--- a/share/default/config/tracker.container.sqlite3.toml
+++ b/share/default/config/tracker.container.sqlite3.toml
@@ -1,2 +1,16 @@
 [core.database]
 path = "/var/lib/torrust/tracker/database/sqlite3.db"
+
+# Uncomment to enable services
+
+#[[udp_trackers]]
+#bind_address = "0.0.0.0:6969"
+
+#[[http_trackers]]
+#bind_address = "0.0.0.0:7070"
+
+#[http_api]
+#bind_address = "0.0.0.0:1212"
+
+#[http_api.access_tokens]
+#admin = "MyAccessToken"
diff --git a/share/default/config/tracker.development.sqlite3.toml b/share/default/config/tracker.development.sqlite3.toml
index bf6478492..84754794e 100644
--- a/share/default/config/tracker.development.sqlite3.toml
+++ b/share/default/config/tracker.development.sqlite3.toml
@@ -1,5 +1,11 @@
 [[udp_trackers]]
-enabled = true
+bind_address = "0.0.0.0:6969"
 
 [[http_trackers]]
-enabled = true
+bind_address = "0.0.0.0:7070"
+
+[http_api]
+bind_address = "0.0.0.0:1212"
+
+[http_api.access_tokens]
+admin = "MyAccessToken"
diff --git a/share/default/config/tracker.e2e.container.sqlite3.toml b/share/default/config/tracker.e2e.container.sqlite3.toml
index 744d267fd..fb33a8e32 100644
--- a/share/default/config/tracker.e2e.container.sqlite3.toml
+++ b/share/default/config/tracker.e2e.container.sqlite3.toml
@@ -2,10 +2,16 @@
 path = "/var/lib/torrust/tracker/database/sqlite3.db"
 
 [[udp_trackers]]
-enabled = true
+bind_address = "0.0.0.0:6969"
 
 [[http_trackers]]
-enabled = true
+bind_address = "0.0.0.0:7070"
+
+[http_api]
+bind_address = "0.0.0.0:1212"
+
+[http_api.access_tokens]
+admin = "MyAccessToken"
 
 [health_check_api]
 # Must be bound to wildcard IP to be accessible from outside the container
diff --git a/share/default/config/tracker.udp.benchmarking.toml b/share/default/config/tracker.udp.benchmarking.toml
index cd193c40a..d9361cf10 100644
--- a/share/default/config/tracker.udp.benchmarking.toml
+++ b/share/default/config/tracker.udp.benchmarking.toml
@@ -6,7 +6,4 @@ remove_peerless_torrents = false
 tracker_usage_statistics = false
 
 [[udp_trackers]]
-enabled = true
-
-[http_api]
-enabled = false
+bind_address = "0.0.0.0:6969"
diff --git a/src/app.rs b/src/app.rs
index b41f4098e..f6a909002 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -25,7 +25,7 @@ use std::sync::Arc;
 
 use tokio::task::JoinHandle;
 use torrust_tracker_configuration::Configuration;
-use tracing::warn;
+use tracing::{info, warn};
 
 use crate::bootstrap::jobs::{health_check_api, http_tracker, torrent_cleanup, tracker_apis, udp_tracker};
 use crate::servers::registar::Registar;
@@ -59,51 +59,56 @@ pub async fn start(config: &Configuration, tracker: Arc<core::Tracker>) -> Vec<J
     }
 
     // Start the UDP blocks
-    for udp_tracker_config in &config.udp_trackers {
-        if !udp_tracker_config.enabled {
-            continue;
-        }
-
-        if tracker.is_private() {
-            warn!(
-                "Could not start UDP tracker on: {} while in {:?}. UDP is not safe for private trackers!",
-                udp_tracker_config.bind_address, config.core.mode
-            );
-        } else {
-            jobs.push(udp_tracker::start_job(udp_tracker_config, tracker.clone(), registar.give_form()).await);
+    match &config.udp_trackers {
+        Some(udp_trackers) => {
+            for udp_tracker_config in udp_trackers {
+                if tracker.is_private() {
+                    warn!(
+                        "Could not start UDP tracker on: {} while in {:?}. UDP is not safe for private trackers!",
+                        udp_tracker_config.bind_address, config.core.mode
+                    );
+                } else {
+                    jobs.push(udp_tracker::start_job(udp_tracker_config, tracker.clone(), registar.give_form()).await);
+                }
+            }
         }
+        None => info!("No UDP blocks in configuration"),
     }
 
     // Start the HTTP blocks
-    for http_tracker_config in &config.http_trackers {
-        if !http_tracker_config.enabled {
-            continue;
+    match &config.http_trackers {
+        Some(http_trackers) => {
+            for http_tracker_config in http_trackers {
+                if let Some(job) = http_tracker::start_job(
+                    http_tracker_config,
+                    tracker.clone(),
+                    registar.give_form(),
+                    servers::http::Version::V1,
+                )
+                .await
+                {
+                    jobs.push(job);
+                };
+            }
         }
-
-        if let Some(job) = http_tracker::start_job(
-            http_tracker_config,
-            tracker.clone(),
-            registar.give_form(),
-            servers::http::Version::V1,
-        )
-        .await
-        {
-            jobs.push(job);
-        };
+        None => info!("No HTTP blocks in configuration"),
     }
 
     // Start HTTP API
-    if config.http_api.enabled {
-        if let Some(job) = tracker_apis::start_job(
-            &config.http_api,
-            tracker.clone(),
-            registar.give_form(),
-            servers::apis::Version::V1,
-        )
-        .await
-        {
-            jobs.push(job);
-        };
+    match &config.http_api {
+        Some(http_api_config) => {
+            if let Some(job) = tracker_apis::start_job(
+                http_api_config,
+                tracker.clone(),
+                registar.give_form(),
+                servers::apis::Version::V1,
+            )
+            .await
+            {
+                jobs.push(job);
+            };
+        }
+        None => info!("No API block in configuration"),
     }
 
     // Start runners to remove torrents without peers, every interval
diff --git a/src/bootstrap/jobs/http_tracker.rs b/src/bootstrap/jobs/http_tracker.rs
index 05bfe2341..fed4e5347 100644
--- a/src/bootstrap/jobs/http_tracker.rs
+++ b/src/bootstrap/jobs/http_tracker.rs
@@ -16,7 +16,6 @@ use std::sync::Arc;
 use axum_server::tls_rustls::RustlsConfig;
 use tokio::task::JoinHandle;
 use torrust_tracker_configuration::HttpTracker;
-use tracing::info;
 
 use super::make_rust_tls;
 use crate::core;
@@ -39,19 +38,14 @@ pub async fn start_job(
     form: ServiceRegistrationForm,
     version: Version,
 ) -> Option<JoinHandle<()>> {
-    if config.enabled {
-        let socket = config.bind_address;
+    let socket = config.bind_address;
 
-        let tls = make_rust_tls(&config.tsl_config)
-            .await
-            .map(|tls| tls.expect("it should have a valid http tracker tls configuration"));
+    let tls = make_rust_tls(&config.tsl_config)
+        .await
+        .map(|tls| tls.expect("it should have a valid http tracker tls configuration"));
 
-        match version {
-            Version::V1 => Some(start_v1(socket, tls, tracker.clone(), form).await),
-        }
-    } else {
-        info!("Note: Not loading Http Tracker Service, Not Enabled in Configuration.");
-        None
+    match version {
+        Version::V1 => Some(start_v1(socket, tls, tracker.clone(), form).await),
     }
 }
 
@@ -93,7 +87,8 @@ mod tests {
     #[tokio::test]
     async fn it_should_start_http_tracker() {
         let cfg = Arc::new(ephemeral_mode_public());
-        let config = &cfg.http_trackers[0];
+        let http_tracker = cfg.http_trackers.clone().expect("missing HTTP tracker configuration");
+        let config = &http_tracker[0];
         let tracker = initialize_with_configuration(&cfg);
         let version = Version::V1;
 
diff --git a/src/bootstrap/jobs/mod.rs b/src/bootstrap/jobs/mod.rs
index 87a607720..79a4347ef 100644
--- a/src/bootstrap/jobs/mod.rs
+++ b/src/bootstrap/jobs/mod.rs
@@ -43,9 +43,7 @@ pub async fn make_rust_tls(opt_tsl_config: &Option<TslConfig>) -> Option<Result<
                     }),
             )
         }
-        None => {
-            None
-        }
+        None => None,
     }
 }
 
diff --git a/src/bootstrap/jobs/tracker_apis.rs b/src/bootstrap/jobs/tracker_apis.rs
index c3b12d7a1..2067e5b0c 100644
--- a/src/bootstrap/jobs/tracker_apis.rs
+++ b/src/bootstrap/jobs/tracker_apis.rs
@@ -26,7 +26,6 @@ use std::sync::Arc;
 use axum_server::tls_rustls::RustlsConfig;
 use tokio::task::JoinHandle;
 use torrust_tracker_configuration::{AccessTokens, HttpApi};
-use tracing::info;
 
 use super::make_rust_tls;
 use crate::core;
@@ -60,21 +59,16 @@ pub async fn start_job(
     form: ServiceRegistrationForm,
     version: Version,
 ) -> Option<JoinHandle<()>> {
-    if config.enabled {
-        let bind_to = config.bind_address;
+    let bind_to = config.bind_address;
 
-        let tls = make_rust_tls(&config.tsl_config)
-            .await
-            .map(|tls| tls.expect("it should have a valid tracker api tls configuration"));
+    let tls = make_rust_tls(&config.tsl_config)
+        .await
+        .map(|tls| tls.expect("it should have a valid tracker api tls configuration"));
 
-        let access_tokens = Arc::new(config.access_tokens.clone());
+    let access_tokens = Arc::new(config.access_tokens.clone());
 
-        match version {
-            Version::V1 => Some(start_v1(bind_to, tls, tracker.clone(), form, access_tokens).await),
-        }
-    } else {
-        info!("Note: Not loading Http Tracker Service, Not Enabled in Configuration.");
-        None
+    match version {
+        Version::V1 => Some(start_v1(bind_to, tls, tracker.clone(), form, access_tokens).await),
     }
 }
 
@@ -110,7 +104,7 @@ mod tests {
     #[tokio::test]
     async fn it_should_start_http_tracker() {
         let cfg = Arc::new(ephemeral_mode_public());
-        let config = &cfg.http_api;
+        let config = &cfg.http_api.clone().unwrap();
         let tracker = initialize_with_configuration(&cfg);
         let version = Version::V1;
 
diff --git a/src/lib.rs b/src/lib.rs
index 7f8c70a47..cf2834418 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -192,21 +192,6 @@
 //! external_ip = "0.0.0.0"
 //! on_reverse_proxy = false
 //!
-//! [[udp_trackers]]
-//! bind_address = "0.0.0.0:6969"
-//! enabled = false
-//!
-//! [[http_trackers]]
-//! bind_address = "0.0.0.0:7070"
-//! enabled = false
-//!
-//! [http_api]
-//! bind_address = "127.0.0.1:1212"
-//! enabled = true
-//!
-//! [http_api.access_tokens]
-//! admin = "MyAccessToken"
-//!
 //! [health_check_api]
 //! bind_address = "127.0.0.1:1313"
 //!```
@@ -253,8 +238,10 @@
 //!
 //! ```toml
 //! [http_api]
-//! enabled = true
 //! bind_address = "127.0.0.1:1212"
+//!
+//! [http_api.access_tokens]
+//! admin = "MyAccessToken"
 //! ```
 //!
 //! By default it's enabled on port `1212`. You also need to add access tokens in the configuration:
@@ -310,7 +297,6 @@
 //!
 //! ```toml
 //! [[http_trackers]]
-//! enabled = true
 //! bind_address = "0.0.0.0:7070"
 //! ```
 //!
@@ -405,7 +391,6 @@
 //!
 //! ```toml
 //! [[udp_trackers]]
-//! enabled = true
 //! bind_address = "0.0.0.0:6969"
 //! ```
 //!
diff --git a/src/servers/apis/mod.rs b/src/servers/apis/mod.rs
index 02b93efa6..6dae66c2d 100644
--- a/src/servers/apis/mod.rs
+++ b/src/servers/apis/mod.rs
@@ -25,7 +25,6 @@
 //!
 //! ```toml
 //! [http_api]
-//! enabled = true
 //! bind_address = "0.0.0.0:1212"
 //!
 //! [http_api.tsl_config]
@@ -112,7 +111,6 @@
 //!
 //! ```toml
 //! [http_api]
-//! enabled = true
 //! bind_address = "0.0.0.0:1212"
 //!
 //! [http_api.tsl_config]
diff --git a/src/servers/apis/server.rs b/src/servers/apis/server.rs
index 74dc89692..246660ab1 100644
--- a/src/servers/apis/server.rs
+++ b/src/servers/apis/server.rs
@@ -274,7 +274,7 @@ mod tests {
     #[tokio::test]
     async fn it_should_be_able_to_start_and_stop() {
         let cfg = Arc::new(ephemeral_mode_public());
-        let config = &cfg.http_api;
+        let config = &cfg.http_api.clone().unwrap();
 
         let tracker = initialize_with_configuration(&cfg);
 
diff --git a/src/servers/http/server.rs b/src/servers/http/server.rs
index bbe0c3cc1..5798f7c10 100644
--- a/src/servers/http/server.rs
+++ b/src/servers/http/server.rs
@@ -206,7 +206,7 @@ impl HttpServer<Running> {
 /// Or if the request returns an error.
 #[must_use]
 pub fn check_fn(binding: &SocketAddr) -> ServiceHealthCheckJob {
-    let url = format!("http://{binding}/health_check");
+    let url = format!("http://{binding}/health_check"); // DevSkim: ignore DS137138
 
     let info = format!("checking http tracker health check at: {url}");
 
@@ -235,7 +235,8 @@ mod tests {
     async fn it_should_be_able_to_start_and_stop() {
         let cfg = Arc::new(ephemeral_mode_public());
         let tracker = initialize_with_configuration(&cfg);
-        let config = &cfg.http_trackers[0];
+        let http_trackers = cfg.http_trackers.clone().expect("missing HTTP trackers configuration");
+        let config = &http_trackers[0];
 
         let bind_to = config.bind_address;
 
diff --git a/src/servers/udp/server.rs b/src/servers/udp/server.rs
index b2c72258d..f36f7df45 100644
--- a/src/servers/udp/server.rs
+++ b/src/servers/udp/server.rs
@@ -460,7 +460,8 @@ mod tests {
     async fn it_should_be_able_to_start_and_stop() {
         let cfg = Arc::new(ephemeral_mode_public());
         let tracker = initialize_with_configuration(&cfg);
-        let config = &cfg.udp_trackers[0];
+        let udp_trackers = cfg.udp_trackers.clone().expect("missing UDP trackers configuration");
+        let config = &udp_trackers[0];
         let bind_to = config.bind_address;
         let register = &Registar::default();
 
diff --git a/tests/servers/api/environment.rs b/tests/servers/api/environment.rs
index 8f84620dd..dc2f70a76 100644
--- a/tests/servers/api/environment.rs
+++ b/tests/servers/api/environment.rs
@@ -31,7 +31,7 @@ impl Environment<Stopped> {
     pub fn new(configuration: &Arc<Configuration>) -> Self {
         let tracker = initialize_with_configuration(configuration);
 
-        let config = Arc::new(configuration.http_api.clone());
+        let config = Arc::new(configuration.http_api.clone().expect("missing API configuration"));
 
         let bind_to = config.bind_address;
 
diff --git a/tests/servers/http/environment.rs b/tests/servers/http/environment.rs
index 6e80569ec..2133ed6d0 100644
--- a/tests/servers/http/environment.rs
+++ b/tests/servers/http/environment.rs
@@ -29,7 +29,12 @@ impl Environment<Stopped> {
     pub fn new(configuration: &Arc<Configuration>) -> Self {
         let tracker = initialize_with_configuration(configuration);
 
-        let config = Arc::new(configuration.http_trackers[0].clone());
+        let http_tracker = configuration
+            .http_trackers
+            .clone()
+            .expect("missing HTTP tracker configuration");
+
+        let config = Arc::new(http_tracker[0].clone());
 
         let bind_to = config.bind_address;
 
diff --git a/tests/servers/udp/environment.rs b/tests/servers/udp/environment.rs
index c1fecbdd3..1ba038c70 100644
--- a/tests/servers/udp/environment.rs
+++ b/tests/servers/udp/environment.rs
@@ -29,7 +29,9 @@ impl Environment<Stopped> {
     pub fn new(configuration: &Arc<Configuration>) -> Self {
         let tracker = initialize_with_configuration(configuration);
 
-        let config = Arc::new(configuration.udp_trackers[0].clone());
+        let udp_tracker = configuration.udp_trackers.clone().expect("missing UDP tracker configuration");
+
+        let config = Arc::new(udp_tracker[0].clone());
 
         let bind_to = config.bind_address;