Make trädgårdstomten be a docker service running separately on hostHEADmain

2 files changed, 9 insertions, 72 deletions

diff --git a/jobs/traedgaardstomten.nomad.hcl b/jobs/traedgaardstomten.nomad.hcl
deleted file mode 100644
index bcd61b4..0000000
--- a/jobs/traedgaardstomten.nomad.hcl
+++ /dev/null
@@ -1,70 +0,0 @@
-job "traedgaardstomten" {
-  group "web" {
-    network {
-      port "http" {
-        to = 80
-      }
-    }
-
-    update {
-      canary       = 1
-      auto_revert  = true
-      auto_promote = true
-    }
-
-    volume "files" {
-      type      = "host"
-      source    = "static-files"
-      read_only = true
-    }
-
-    service {
-      name     = "traedgaardstomten"
-      port     = "http"
-      provider = "nomad"
-
-      tags = [
-        "traefik.enable=true",
-        "traefik.http.routers.traedgaardstomten.rule=Host(`xn--trdgrdstomten-cfbr.se`)||Host(`www.xn--trdgrdstomten-cfbr.se`)",
-        "traefik.http.routers.traedgaardstomten.tls.certresolver=default",
-      ]
-    }
-
-    task "web" {
-      driver = "docker"
-
-      resources {
-        cpu    = 50
-        memory = 20
-      }
-
-      volume_mount {
-        volume      = "files"
-        destination = "/var/www"
-      }
-
-      config {
-        image = "nginx:1.29-alpine"
-        ports = ["http"]
-
-        volumes = [
-          "local:/etc/nginx/conf.d",
-        ]
-      }
-
-      template {
-        data = <<EOF
-server {
-  listen 80 default_server;
-  listen [::]:80 default_server;
-  http2 on;
-
-  autoindex off;
-  root /var/www/sites/trädgårdstomten;
-}
-EOF
-        destination = "local/website.conf"
-      }
-    }
-  }
-}
diff --git a/jobs/traefik.nomad.hcl b/jobs/traefik.nomad.hcl
index c78f29d..63c07e3 100644
--- a/jobs/traefik.nomad.hcl
+++ b/jobs/traefik.nomad.hcl
@@ -89,9 +89,7 @@ EOF
     [certificatesResolvers.default.acme.httpChallenge]
         entryPoint = "httpredirect"
 
-# Enable Consul Catalog configuration backend.
 [providers.nomad]
-    prefix           = "traefik"
     exposedByDefault = false
 
     [providers.nomad.endpoint]
@@ -122,6 +120,11 @@ http:
       service: ctftajm
       tls:
         certResolver: default
+    traedgaardstomten:
+      rule: Host(`xn--trdgrdstomten-cfbr.se`)||Host(`www.xn--trdgrdstomten-cfbr.se`)
+      service: traedgaardstomten
+      tls:
+        certResolver: default
   middlewares:
     auth:
       basicAuth:
@@ -132,6 +135,10 @@ http:
       loadBalancer:
         servers:
           - url: "http://garm:8008"
+    traedgaardstomten:
+      loadBalancer:
+        servers:
+          - url: "http://garm:8009"
 YAML
         destination = "local/dynamic-conf.yaml"
       }