From 04b07e354a13aa458d56dc813589e7645877af08 Mon Sep 17 00:00:00 2001
From: Mathias Magnusson <mathias@magnusson.space>
Date: Tue, 22 Aug 2023 20:34:02 +0200
Subject: Move to `space` tld

---
 jobs/certificates.nomad.hcl      |  1 +
 jobs/files.nomad.hcl             |  4 ++--
 jobs/homepage/homepage.nomad.hcl |  5 +++--
 jobs/nginx.nomad.hcl             | 12 ++++++++----
 4 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'jobs')

diff --git a/jobs/certificates.nomad.hcl b/jobs/certificates.nomad.hcl
index 26253b7..22b0ab6 100644
--- a/jobs/certificates.nomad.hcl
+++ b/jobs/certificates.nomad.hcl
@@ -26,6 +26,7 @@ job "certificates" {
           "--path", "/lego",
           "--email", "mathias+certs@magnusson.space",
           "--dns", "cloudflare",
+          "-d", "magnusson.space", "-d", "*.magnusson.space",
           "-d", "magnusson.wiki", "-d", "*.magnusson.wiki",
           "run"
         ]
diff --git a/jobs/files.nomad.hcl b/jobs/files.nomad.hcl
index fff35b1..d5eb6f3 100644
--- a/jobs/files.nomad.hcl
+++ b/jobs/files.nomad.hcl
@@ -18,8 +18,8 @@ job "files" {
       provider = "nomad"
 
       tags = [
-        "nginx.hostname=files.magnusson.wiki",
-        "nginx.certname=magnusson.wiki",
+        "nginx.hostname=files.magnusson.space",
+        "nginx.certname=magnusson.space",
       ]
     }
 
diff --git a/jobs/homepage/homepage.nomad.hcl b/jobs/homepage/homepage.nomad.hcl
index 1544f1e..c8ca5ad 100644
--- a/jobs/homepage/homepage.nomad.hcl
+++ b/jobs/homepage/homepage.nomad.hcl
@@ -14,8 +14,9 @@ job "homepage" {
       provider = "nomad"
 
       tags = [
-        "nginx.hostname=.magnusson.wiki",
-        "nginx.certname=magnusson.wiki",
+        "nginx.hostname=.magnusson.space",
+        "nginx.certname=magnusson.space",
+        "nginx.default_server",
       ]
     }
 
diff --git a/jobs/nginx.nomad.hcl b/jobs/nginx.nomad.hcl
index 1e21647..ccd9e0a 100644
--- a/jobs/nginx.nomad.hcl
+++ b/jobs/nginx.nomad.hcl
@@ -39,6 +39,7 @@ job "virtual-hosting" {
 {{- range nomadServices -}}
   {{- $hostname := "" -}}
   {{- $certname := "" -}}
+  {{- $default := "" -}}
   {{- range $tag := .Tags -}}
     {{- if $tag | regexMatch "nginx.hostname=" -}}
       {{- $hostname = $tag | replaceAll "nginx.hostname=" "" -}}
@@ -46,6 +47,9 @@ job "virtual-hosting" {
     {{- if $tag | regexMatch "nginx.certname=" -}}
       {{- $certname = $tag | replaceAll "nginx.certname=" "" -}}
     {{- end -}}
+    {{- if $tag | regexMatch "nginx.default_server" -}}
+      {{- $default = "default_server" -}}
+    {{- end -}}
   {{- end -}}
   {{- if eq $hostname "" -}}
     {{- continue -}}
@@ -61,8 +65,8 @@ upstream {{ $upstream }} {
 }
 
 server {
-  listen 80;
-  listen [::]:80;
+  listen 80 {{ $default }};
+  listen [::]:80 {{ $default }};
   http2 on;
   server_name {{ $hostname }};
 
@@ -80,8 +84,8 @@ server {
 
 {{ if ne $certname "" -}}
 server {
-  listen 443 ssl;
-  listen [::]:443 ssl;
+  listen 443 ssl {{ $default }};
+  listen [::]:443 ssl {{ $default }};
   http2 on;
   server_name {{ $hostname }};
 
-- 
cgit v1.2.3