From 2f2c5e2341f894c65d2a07086de26142e7244ecc Mon Sep 17 00:00:00 2001 From: Mathias Magnusson Date: Wed, 5 Mar 2025 18:56:25 +0100 Subject: update some stuff --- .gitignore | 2 +- jobs/besiktn.ing/besiktn.ing.nomad.hcl | 64 --------------------- jobs/besiktn.ing/index.html | 20 ------- jobs/faeltkullen.nomad.hcl | 1 - jobs/files.nomad.hcl | 1 - .../f\303\266rs\303\244kr.ing.nomad.hcl" | 64 --------------------- "jobs/f\303\266rs\303\244kr.ing/index.html" | 21 ------- jobs/homepage/homepage.nomad.hcl | 1 - jobs/raytracer.nomad.hcl | 1 - jobs/rr.nomad.hcl | 1 - jobs/srg/srg.nomad.hcl | 1 - jobs/traefik.nomad.hcl | 45 +++++++-------- jobs/vaultwarden.nomad.hcl | 62 -------------------- nomad-agent-ca-key.pem.age | Bin 545 -> 808 bytes nomad-agent-ca.pem | 19 ++++++ nomad-agent-ca.pem.age | Bin 1437 -> 0 bytes 16 files changed, 42 insertions(+), 261 deletions(-) delete mode 100644 jobs/besiktn.ing/besiktn.ing.nomad.hcl delete mode 100644 jobs/besiktn.ing/index.html delete mode 100644 "jobs/f\303\266rs\303\244kr.ing/f\303\266rs\303\244kr.ing.nomad.hcl" delete mode 100644 "jobs/f\303\266rs\303\244kr.ing/index.html" delete mode 100644 jobs/vaultwarden.nomad.hcl create mode 100644 nomad-agent-ca.pem delete mode 100644 nomad-agent-ca.pem.age diff --git a/.gitignore b/.gitignore index cdc99a4..d09ff1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ .env -*.pem +*-key.pem diff --git a/jobs/besiktn.ing/besiktn.ing.nomad.hcl b/jobs/besiktn.ing/besiktn.ing.nomad.hcl deleted file mode 100644 index ace4d1a..0000000 --- a/jobs/besiktn.ing/besiktn.ing.nomad.hcl +++ /dev/null @@ -1,64 +0,0 @@ -job "besiktn.ing" { - group "web" { - count = 1 - - network { - port "http" { - to = 80 - } - } - - service { - name = "besiktning" - port = "http" - provider = "nomad" - - tags = [ - "traefik.enable=true", - "traefik.http.routers.besiktning.rule=Host(`besiktn.ing`)||Host(`www.besiktn.ing`)", - "traefik.http.routers.besiktning.entrypoints=https", - "traefik.http.routers.besiktning.tls.certresolver=default", - ] - } - - task "web" { - driver = "docker" - - resources { - cpu = 50 - memory = 20 - } - - config { - image = "nginx:1.25-alpine" - ports = ["http"] - - volumes = [ - "local/config:/etc/nginx/conf.d", - "local/html:/var/www/html", - ] - } - - template { - data = < - - - - - - Besiktn.ing - - - -

Besikta biljäveln

annars får du inte köra fanskapet

- - diff --git a/jobs/faeltkullen.nomad.hcl b/jobs/faeltkullen.nomad.hcl index 2cfbd55..a5065fe 100644 --- a/jobs/faeltkullen.nomad.hcl +++ b/jobs/faeltkullen.nomad.hcl @@ -20,7 +20,6 @@ job "faeltkullen" { tags = [ "traefik.enable=true", "traefik.http.routers.faeltkullen.rule=Host(`xn--fltkullen-v2a.magnusson.space`)||Host(`www.xn--fltkullen-v2a.magnusson.space`)", - "traefik.http.routers.faeltkullen.entrypoints=https", "traefik.http.routers.faeltkullen.tls.certresolver=default", ] } diff --git a/jobs/files.nomad.hcl b/jobs/files.nomad.hcl index 28fa3a5..2bb2b00 100644 --- a/jobs/files.nomad.hcl +++ b/jobs/files.nomad.hcl @@ -20,7 +20,6 @@ job "files" { tags = [ "traefik.enable=true", "traefik.http.routers.files.rule=Host(`files.magnusson.space`)", - "traefik.http.routers.files.entrypoints=https", "traefik.http.routers.files.tls.certresolver=default", ] } diff --git "a/jobs/f\303\266rs\303\244kr.ing/f\303\266rs\303\244kr.ing.nomad.hcl" "b/jobs/f\303\266rs\303\244kr.ing/f\303\266rs\303\244kr.ing.nomad.hcl" deleted file mode 100644 index 0b0a7db..0000000 --- "a/jobs/f\303\266rs\303\244kr.ing/f\303\266rs\303\244kr.ing.nomad.hcl" +++ /dev/null @@ -1,64 +0,0 @@ -job "försäkr.ing" { - group "web" { - count = 1 - - network { - port "http" { - to = 80 - } - } - - service { - name = "forsakring" - port = "http" - provider = "nomad" - - tags = [ - "traefik.enable=true", - "traefik.http.routers.forsakring.rule=Host(`xn--frskr-ira7j.ing`)||Host(`www.xn--frskr-ira7j.ing`)", - "traefik.http.routers.forsakring.entrypoints=https", - "traefik.http.routers.forsakring.tls.certresolver=default", - ] - } - - task "web" { - driver = "docker" - - resources { - cpu = 50 - memory = 20 - } - - config { - image = "nginx:1.25-alpine" - ports = ["http"] - - volumes = [ - "local/config:/etc/nginx/conf.d", - "local/html:/var/www/html", - ] - } - - template { - data = < - - - - - - Försäkr.ing - - - -

Försäkra biljäveln

annars får du inte köra fanskapet

(gäller även andra saker)

- - diff --git a/jobs/homepage/homepage.nomad.hcl b/jobs/homepage/homepage.nomad.hcl index 57be8fd..dc1be71 100644 --- a/jobs/homepage/homepage.nomad.hcl +++ b/jobs/homepage/homepage.nomad.hcl @@ -16,7 +16,6 @@ job "homepage" { tags = [ "traefik.enable=true", "traefik.http.routers.homepage.rule=Host(`magnusson.space`)||Host(`www.magnusson.space`)", - "traefik.http.routers.homepage.entrypoints=https", "traefik.http.routers.homepage.tls.certresolver=default", ] } diff --git a/jobs/raytracer.nomad.hcl b/jobs/raytracer.nomad.hcl index 4642a8b..4a528e5 100644 --- a/jobs/raytracer.nomad.hcl +++ b/jobs/raytracer.nomad.hcl @@ -20,7 +20,6 @@ job "raytracer" { tags = [ "traefik.enable=true", "traefik.http.routers.raytracer.rule=Host(`raytracer.magnusson.space`)", - "traefik.http.routers.raytracer.entrypoints=https", "traefik.http.routers.raytracer.tls.certresolver=default", ] } diff --git a/jobs/rr.nomad.hcl b/jobs/rr.nomad.hcl index 4796b27..9c00e3b 100644 --- a/jobs/rr.nomad.hcl +++ b/jobs/rr.nomad.hcl @@ -20,7 +20,6 @@ job "rr" { tags = [ "traefik.enable=true", "traefik.http.routers.rr.rule=Host(`rr.magnusson.space`)", - "traefik.http.routers.rr.entrypoints=https", "traefik.http.routers.rr.tls.certresolver=default", ] } diff --git a/jobs/srg/srg.nomad.hcl b/jobs/srg/srg.nomad.hcl index 29d2374..535258f 100644 --- a/jobs/srg/srg.nomad.hcl +++ b/jobs/srg/srg.nomad.hcl @@ -16,7 +16,6 @@ job "srg" { tags = [ "traefik.enable=true", "traefik.http.routers.srg.rule=Host(`xn--srskildakommandorrelsegruppen-0pc88c.se`)||Host(`www.xn--srskildakommandorrelsegruppen-0pc88c.se`)", - "traefik.http.routers.srg.entrypoints=https", "traefik.http.routers.srg.tls.certresolver=default", ] } diff --git a/jobs/traefik.nomad.hcl b/jobs/traefik.nomad.hcl index 1107117..e399ef2 100644 --- a/jobs/traefik.nomad.hcl +++ b/jobs/traefik.nomad.hcl @@ -41,23 +41,23 @@ job "traefik" { template { data = <