summaryrefslogtreecommitdiff
path: root/jobs
diff options
context:
space:
mode:
authorMathias Magnusson <mathias@magnusson.space>2025-03-05 18:56:25 +0100
committerMathias Magnusson <mathias@magnusson.space>2025-03-05 18:56:25 +0100
commit2f2c5e2341f894c65d2a07086de26142e7244ecc (patch)
tree3a2a9166161871a1955390697eae43d909102a2e /jobs
parentc6030a84030945f1800a9fe292298e1388e0e5d3 (diff)
downloadgarm-2f2c5e2341f894c65d2a07086de26142e7244ecc.tar.gz
update some stuff
Diffstat (limited to 'jobs')
-rw-r--r--jobs/besiktn.ing/besiktn.ing.nomad.hcl64
-rw-r--r--jobs/besiktn.ing/index.html20
-rw-r--r--jobs/faeltkullen.nomad.hcl1
-rw-r--r--jobs/files.nomad.hcl1
-rw-r--r--jobs/försäkr.ing/försäkr.ing.nomad.hcl64
-rw-r--r--jobs/försäkr.ing/index.html21
-rw-r--r--jobs/homepage/homepage.nomad.hcl1
-rw-r--r--jobs/raytracer.nomad.hcl1
-rw-r--r--jobs/rr.nomad.hcl1
-rw-r--r--jobs/srg/srg.nomad.hcl1
-rw-r--r--jobs/traefik.nomad.hcl45
-rw-r--r--jobs/vaultwarden.nomad.hcl62
12 files changed, 22 insertions, 260 deletions
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 = <<EOF
-server {
- listen 80 default_server;
- listen [::]:80 default_server;
- http2 on;
-
- root /var/www/html;
- location / {
- index index.html;
- }
-}
-EOF
- destination = "local/config/website.conf"
- }
-
- template {
- data = file("jobs/besiktn.ing/index.html")
- destination = "local/html/index.html"
- }
- }
- }
-}
diff --git a/jobs/besiktn.ing/index.html b/jobs/besiktn.ing/index.html
deleted file mode 100644
index 441c3e9..0000000
--- a/jobs/besiktn.ing/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="sv">
-<head>
- <meta charset="UTF-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Besiktn.ing</title>
- <style>
-body {
- text-align: center;
- padding-top: 20vh;
- font-family: sans-serif;
-}
- </style>
-</head>
-<body>
- <h1>Besikta biljäveln</h1>
- <p>annars får du inte köra fanskapet</p>
-</body>
-</html>
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örsäkr.ing/försäkr.ing.nomad.hcl b/jobs/försäkr.ing/försäkr.ing.nomad.hcl
deleted file mode 100644
index 0b0a7db..0000000
--- a/jobs/försäkr.ing/försäkr.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 = <<EOF
-server {
- listen 80 default_server;
- listen [::]:80 default_server;
- http2 on;
-
- root /var/www/html;
- location / {
- index index.html;
- }
-}
-EOF
- destination = "local/config/website.conf"
- }
-
- template {
- data = file("jobs/försäkr.ing/index.html")
- destination = "local/html/index.html"
- }
- }
- }
-}
diff --git a/jobs/försäkr.ing/index.html b/jobs/försäkr.ing/index.html
deleted file mode 100644
index 86e06fd..0000000
--- a/jobs/försäkr.ing/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html lang="sv">
-<head>
- <meta charset="UTF-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Försäkr.ing</title>
- <style>
-body {
- text-align: center;
- padding-top: 20vh;
- font-family: sans-serif;
-}
- </style>
-</head>
-<body>
- <h1>Försäkra biljäveln</h1>
- <p>annars får du inte köra fanskapet</p>
- <p>(gäller även andra saker)</p>
-</body>
-</html>
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 = <<EOF
-----BEGIN CERTIFICATE-----
-MIIDDTCCArKgAwIBAgIRAIYjjhWbJ80SG4cXZF6bGVIwCgYIKoZIzj0EAwIwgcgx
-CzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj
-bzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw
-FQYDVQQKEw5IYXNoaUNvcnAgSW5jLjEOMAwGA1UECxMFTm9tYWQxPzA9BgNVBAMT
-Nk5vbWFkIEFnZW50IENBIDE3ODMwMTE2MzYzOTIwMDg3MDMyMTI4NzQyMTA5ODEy
-MTE3MzMzMDAeFw0yMzA4MjAyMDE0MzdaFw0yODA4MTgyMDE0MzdaMIHIMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xGjAY
-BgNVBAkTETEwMSBTZWNvbmQgU3RyZWV0MQ4wDAYDVQQREwU5NDEwNTEXMBUGA1UE
-ChMOSGFzaGlDb3JwIEluYy4xDjAMBgNVBAsTBU5vbWFkMT8wPQYDVQQDEzZOb21h
-ZCBBZ2VudCBDQSAxNzgzMDExNjM2MzkyMDA4NzAzMjEyODc0MjEwOTgxMjExNzMz
-MzAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQnSx/6sQkxGuL9kaDAyUGoqWYJ
-bAzrBrhyNLMkjjYXQ7QrzSOIzGfUGj2A4AzpHbU0t9k+JKaVHaKevcPVFyLMo3sw
-eTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgqgrh
-OUp/Z5bL0pf20U6mGO57+PdAU88f3U6MbvYPaqMwKwYDVR0jBCQwIoAgqgrhOUp/
-Z5bL0pf20U6mGO57+PdAU88f3U6MbvYPaqMwCgYIKoZIzj0EAwIDSQAwRgIhAOuN
-l6lMSJW7er6SN22jKxR+oxrk9755eKm0b4GCDscCAiEAjlyxJnwTSF1v23cCS4c+
-V435uuYooblwdUaga7fTDkE=
+MIIDCzCCArGgAwIBAgIQbot0jxQHoG8s73hr191WtDAKBggqhkjOPQQDAjCByDEL
+MAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv
+MRowGAYDVQQJExExMDEgU2Vjb25kIFN0cmVldDEOMAwGA1UEERMFOTQxMDUxFzAV
+BgNVBAoTDkhhc2hpQ29ycCBJbmMuMQ4wDAYDVQQLEwVOb21hZDE/MD0GA1UEAxM2
+Tm9tYWQgQWdlbnQgQ0EgMTQ2OTM5MTcyODk1MDE3MjcwNDk5OTgxOTYzNTQzOTI3
+Njc0NTQ4MB4XDTI1MDMwNTE2MjY1OFoXDTMwMDMwNDE2MjY1OFowgcgxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEaMBgG
+A1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcwFQYDVQQK
+Ew5IYXNoaUNvcnAgSW5jLjEOMAwGA1UECxMFTm9tYWQxPzA9BgNVBAMTNk5vbWFk
+IEFnZW50IENBIDE0NjkzOTE3Mjg5NTAxNzI3MDQ5OTk4MTk2MzU0MzkyNzY3NDU0
+ODBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIiynXPFpPbn1ybdwlHscUXMKC+C
+CHNImr+HdySSAMrzKxglug6TBxyTGG3Xx41xCaBIvKjij9ayUMi1VgXEa7CjezB5
+MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCGQHlJ
+Jq7rUsjrK8nFttoCV25j687nsTAHRt0eGfK84zArBgNVHSMEJDAigCCGQHlJJq7r
+UsjrK8nFttoCV25j687nsTAHRt0eGfK84zAKBggqhkjOPQQDAgNIADBFAiBPQ2vM
+Fc0v5ctHR9f6cOHP2gIvYzIuYcBMq09TybzjrAIhAPgUAib3h9HA83SsoSa0PM8S
+ZRHZBs9a7IewBXeVqgL8
-----END CERTIFICATE-----
EOF
destination = "local/nomad-agent-ca.pem"
@@ -66,14 +66,15 @@ EOF
template {
data = <<EOF
[entryPoints]
- [entryPoints.http]
+ [entryPoints.httpredirect]
address = ":80"
- [entryPoints.http.http.redirections.entryPoint]
- to = "https"
+ [entryPoints.httpredirect.http.redirections.entryPoint]
+ to = "web"
scheme = "https"
permanent = "true"
- [entryPoints.https]
+ [entryPoints.web]
address = ":443"
+ asDefault = true
[accessLog]
[log]
@@ -116,13 +117,11 @@ http:
- auth
tls:
certResolver: default
- entrypoints: https
ctftajm:
rule: Host(`ctftajm.se`)||Host(`www.ctftajm.se`)
service: ctftajm
tls:
certResolver: default
- entrypoints: https
middlewares:
auth:
basicAuth:
diff --git a/jobs/vaultwarden.nomad.hcl b/jobs/vaultwarden.nomad.hcl
deleted file mode 100644
index f42b195..0000000
--- a/jobs/vaultwarden.nomad.hcl
+++ /dev/null
@@ -1,62 +0,0 @@
-job "vaultwarden" {
- group "vaultwarden" {
- count = 1
-
- network {
- port "http" {
- to = 80
- }
- }
-
- service {
- name = "vaultwarden-web"
- port = "http"
- provider = "nomad"
-
- tags = [
- "traefik.enable=true",
- "traefik.http.routers.vaultwarden.rule=Host(`vaultwarden.magnusson.space`)",
- "traefik.http.routers.vaultwarden.entrypoints=https",
- "traefik.http.routers.vaultwarden.tls.certresolver=default",
- ]
- }
-
- volume "vaultwarden" {
- type = "host"
- source = "vaultwarden"
- }
-
- task "vaultwarden" {
- driver = "docker"
-
- resources {
- cpu = 100
- memory = 150
- }
-
- volume_mount {
- volume = "vaultwarden"
- destination = "/data"
- }
-
- config {
- image = "vaultwarden/server:1.32.0-alpine"
- ports = ["http"]
- }
-
- template {
- data = <<EOF
-SIGNUPS_ALLOWED=false
-DOMAIN=https://vaultwarden.magnusson.space
-PUSH_ENABLED=true
-{{ with nomadVar "nomad/jobs/vaultwarden" }}
-PUSH_INSTALLATION_ID={{ .installation_id }}
-PUSH_INSTALLATION_KEY={{ .installation_key }}
-{{ end }}
-EOF
- destination = "local/.env"
- env = true
- }
- }
- }
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-10 17:34:05 +0000