feat(homeserver): Set default icann_domain to localhost (#112)

This commit is contained in:
Severin Alexander Bühler
2025-04-28 09:59:40 +03:00
committed by GitHub
parent 8c6e3caf17
commit bafa89f395
2 changed files with 8 additions and 4 deletions

View File

@@ -51,7 +51,7 @@ public_icann_http_port = 80
#
# ICANN TLS is not natively supported, so you should be running
# a reverse proxy and managing certificates yourself.
icann_domain = "example.com"
icann_domain = "localhost"
# The interval at which user keys are republished to the DHT.
# 0 means disabled.

View File

@@ -34,7 +34,7 @@ pub struct PkdnsToml {
pub public_icann_http_port: Option<u16>,
/// Optional domain name of the regular http API.
#[serde(default)]
#[serde(default = "default_icann_domain")]
pub icann_domain: Option<Domain>,
/// The interval at which the user keys are republished in the DHT.
@@ -62,7 +62,7 @@ impl Default for PkdnsToml {
public_ip: default_public_ip(),
public_pubky_tls_port: Option::default(),
public_icann_http_port: Option::default(),
icann_domain: Option::default(),
icann_domain: default_icann_domain(),
user_keys_republisher_interval: default_user_keys_republisher_interval(),
dht_bootstrap_nodes: default_dht_bootstrap_nodes(),
dht_relay_nodes: default_dht_relay_nodes(),
@@ -92,6 +92,10 @@ fn default_user_keys_republisher_interval() -> u64 {
14400
}
fn default_icann_domain() -> Option<Domain> {
Some(Domain::from_str("localhost").expect("localhost is a valid domain"))
}
/// All configuration related to file drive
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
pub struct DriveToml {
@@ -268,7 +272,7 @@ mod tests {
c.drive.icann_listen_socket,
default_icann_drive_listen_socket()
);
assert_eq!(c.pkdns.icann_domain, None);
assert_eq!(c.pkdns.icann_domain, default_icann_domain());
assert_eq!(
c.drive.pubky_listen_socket,