From 7c9d3f473a3577efcc44a1177ce28119884005c9 Mon Sep 17 00:00:00 2001 From: Oliver Stenbom Date: Fri, 26 Jan 2024 08:52:22 +0100 Subject: [PATCH 1/3] Use all domains in caddy config supports *.api.mentimeter.dev for example --- linkup-cli/src/local_config.rs | 6 ++++++ linkup-cli/src/services/caddy.rs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/linkup-cli/src/local_config.rs b/linkup-cli/src/local_config.rs index 736ab79..7270ff6 100644 --- a/linkup-cli/src/local_config.rs +++ b/linkup-cli/src/local_config.rs @@ -113,6 +113,12 @@ impl YamlLocalConfig { .collect::>() } + pub fn domains(&self) -> Vec { + self.domains + .iter() + .collect::>() + } + pub fn create_preview_request(&self, services: &[(String, String)]) -> CreatePreviewRequest { let services = self .services diff --git a/linkup-cli/src/services/caddy.rs b/linkup-cli/src/services/caddy.rs index dfe6ea7..84512e5 100644 --- a/linkup-cli/src/services/caddy.rs +++ b/linkup-cli/src/services/caddy.rs @@ -21,7 +21,7 @@ pub fn start(local_config: &YamlLocalConfig) -> Result<()> { } let domains: Vec = local_config - .top_level_domains() + .domains() .iter() .map(|domain| format!("{domain}, *.{domain}")) .collect(); From fa1d78cbec606fa9e4d41ee5e486c46297f4a647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Augusto=20C=C3=A9sar?= Date: Fri, 26 Jan 2024 11:25:26 +0100 Subject: [PATCH 2/3] fix: use inner domain on StorableDomain --- linkup-cli/src/local_config.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/linkup-cli/src/local_config.rs b/linkup-cli/src/local_config.rs index 7270ff6..d36dc2b 100644 --- a/linkup-cli/src/local_config.rs +++ b/linkup-cli/src/local_config.rs @@ -116,6 +116,7 @@ impl YamlLocalConfig { pub fn domains(&self) -> Vec { self.domains .iter() + .map(|storable_domain| storable_domain.domain.clone()) .collect::>() } From ed9ab0bf0f775bf4bd5cea354894b5155ae4780d Mon Sep 17 00:00:00 2001 From: Oliver Stenbom Date: Fri, 26 Jan 2024 12:44:51 +0100 Subject: [PATCH 3/3] Bump version --- Cargo.lock | 2 +- linkup-cli/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5eba716..1991c64 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1042,7 +1042,7 @@ dependencies = [ [[package]] name = "linkup-cli" -version = "0.2.4" +version = "0.2.5" dependencies = [ "actix-web", "clap", diff --git a/linkup-cli/Cargo.toml b/linkup-cli/Cargo.toml index fab72f5..85d2fa9 100644 --- a/linkup-cli/Cargo.toml +++ b/linkup-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "linkup-cli" -version = "0.2.4" +version = "0.2.5" edition = "2021" [[bin]]