Allow specifying service domain directly

example-service.toml

@@ -19,9 +19,9 @@
   # Whether to enable web access (default: true)
   enabled = true
 
-  # The base domain where the application can be accessed
-  # Defaults to the `deployment.domain` key in the configuration
-  base = "wafflehacks.tech"
+  # The domain where the application can be accessed
+  # Defaults to the filename combined with the `deployment.domain` key in the configuration
+  domain = "testing.wafflehacks.tech"
 
 # What external services this depends on
 # Currently supports: PostgreSQL and Redis

src/management/services.rs

@@ -74,7 +74,7 @@ async fn get(service: String) -> Result<impl Reply, Rejection> {
             "{}.{}",
             &service,
             cfg.web
-                .base
+                .domain
                 .as_ref()
                 .unwrap_or_else(|| &config::instance().deployment.domain)
         ))

src/processor/jobs/update_service.rs

@@ -50,13 +50,16 @@ impl Job for UpdateService {
             .image(&service.docker.image, &service.docker.tag);
 
         if service.web.enabled {
-            let subdomain = self.name.replace('-', ".");
-            let base = match &service.web.base {
-                Some(base) => base,
-                None => &config.deployment.domain,
+            let domain = match service.web.domain.clone() {
+                Some(d) => d,
+                None => format!(
+                    "{}.{}",
+                    self.name.replace('-', "."),
+                    &config.deployment.domain
+                ),
             };
 
-            options = options.domain(format!("{}.{}", subdomain, base));
+            options = options.domain(domain);
         }
 
         for (k, v) in service.environment.iter() {

src/service/mod.rs

@@ -120,14 +120,14 @@ pub struct Web {
     pub enabled: bool,
     #[serde(default)]
     #[serde_as(as = "NoneAsEmptyString")]
-    pub base: Option<String>,
+    pub domain: Option<String>,
 }
 
 impl Default for Web {
     fn default() -> Web {
         Web {
             enabled: true,
-            base: None,
+            domain: None,
         }
     }
 }
@@ -159,7 +159,7 @@ mod tests {
         assert_eq!(service.environment.len(), 4);
         assert_eq!(service.secrets.len(), 6);
         assert_eq!(service.web.enabled, true);
-        assert_eq!(service.web.base, Some("wafflehacks.tech".into()));
+        assert_eq!(service.web.domain, Some("testing.wafflehacks.tech".into()));
     }
 
     #[tokio::test]
@@ -177,6 +177,6 @@ mod tests {
         assert_eq!(service.environment.len(), 0);
         assert_eq!(service.secrets.len(), 0);
         assert_eq!(service.web.enabled, true);
-        assert_eq!(service.web.base, None);
+        assert_eq!(service.web.domain, None);
     }
 }