diff --git a/aquatic_http/src/config.rs b/aquatic_http/src/config.rs index 517d75b..95bc281 100644 --- a/aquatic_http/src/config.rs +++ b/aquatic_http/src/config.rs @@ -10,7 +10,7 @@ use serde::Deserialize; use aquatic_common::cli::LogLevel; /// aquatic_http configuration -/// +/// /// Does not support running behind a reverse proxy. #[derive(Clone, Debug, PartialEq, TomlConfig, Deserialize)] #[serde(default, deny_unknown_fields)] diff --git a/aquatic_ws/src/config.rs b/aquatic_ws/src/config.rs index 2026bd4..b295aa3 100644 --- a/aquatic_ws/src/config.rs +++ b/aquatic_ws/src/config.rs @@ -9,7 +9,7 @@ use aquatic_common::cli::LogLevel; use aquatic_toml_config::TomlConfig; /// aquatic_ws configuration -/// +/// /// Running behind a reverse proxy is supported, but IPv4 peer requests have /// to be proxied to IPv4 requests, and IPv6 requests to IPv6 requests. #[derive(Clone, Debug, PartialEq, TomlConfig, Deserialize)] diff --git a/aquatic_ws/src/lib.rs b/aquatic_ws/src/lib.rs index ee75e86..927c810 100644 --- a/aquatic_ws/src/lib.rs +++ b/aquatic_ws/src/lib.rs @@ -47,13 +47,14 @@ pub fn run(config: Config) -> ::anyhow::Result<()> { let (sentinel_watcher, sentinel) = PanicSentinelWatcher::create_with_sentinel(); let priv_dropper = PrivilegeDropper::new(config.privileges.clone(), config.socket_workers); - let opt_tls_config = config - .network - .enable_tls - .then_some(Arc::new(create_rustls_config( + let opt_tls_config = if config.network.enable_tls { + Some(Arc::new(create_rustls_config( &config.network.tls_certificate_path, &config.network.tls_private_key_path, - )?)); + )?)) + } else { + None + }; let mut executors = Vec::new();