From 31d921f140532960dcd3267bdd863968f6fdc61a Mon Sep 17 00:00:00 2001
From: Elara Musayelyan <elara@elara.ws>
Date: Sat, 7 Oct 2023 11:44:48 -0700
Subject: [PATCH] Move lure-web to lure.sh

---
 .woodpecker.yml                  |  2 +-
 frontend/src/routes/+page.svelte |  2 +-
 template.nomad                   | 21 +++++++++++++--------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index c01e295..c9c436b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -4,7 +4,7 @@ steps:
     image: gitea.elara.ws/elara6331/node
     directory: frontend
     environment:
-      - LURE_WEB_API_URL=https://api.lure.elara.ws
+      - LURE_WEB_API_URL=https://api.lure.sh
     commands:
       - npm i
       - npm run build
diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
index 5402705..a4737e6 100644
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@@ -35,7 +35,7 @@
 	<p class="subtitle">
 		Paste this into your Linux terminal and the install script will set everything up for you
 	</p>
-	<Highlight language={bash} code="curl -fsSL lure.elara.ws/install | bash" />
+	<Highlight language={bash} code="curl -fsSL lure.sh/install | bash" />
 	<p>
 		LURE is also available on the AUR as <a
 			href="https://aur.archlinux.org/packages/linux-user-repository-bin"
diff --git a/template.nomad b/template.nomad
index 74d4222..2468bae 100644
--- a/template.nomad
+++ b/template.nomad
@@ -19,7 +19,7 @@ job "lure-web" {
 
       env {
         LURE_API_GITHUB_SECRET = "${LURE_API_GITHUB_SECRET}"
-        
+
         // Hack to force Nomad to re-deploy the service
         // instead of ignoring it
         COMMIT_SHA = "${DRONE_COMMIT_SHA}"
@@ -35,7 +35,7 @@ job "lure-web" {
         port = "api"
         tags = [
           "traefik.enable=true",
-          "traefik.http.routers.lure-backend.rule=Host(`api.lure.elara.ws`)",
+          "traefik.http.routers.lure-backend.rule=Host(`api.lure.sh`)",
           "traefik.http.routers.lure-backend.tls.certresolver=letsencrypt"
         ]
 
@@ -50,11 +50,11 @@ job "lure-web" {
 
     task "frontend" {
       driver = "docker"
-      
+
       config {
         image = "gitea.elara.ws/lure/frontend:latest"
         ports = ["http"]
-        args = ["build"]
+        args  = ["build"]
       }
 
 
@@ -63,16 +63,21 @@ job "lure-web" {
         port = "http"
         tags = [
           "traefik.enable=true",
-          "traefik.http.routers.lure-frontend.rule=Host(`lure.elara.ws`)",
+          "traefik.http.middlewares.lure-redir.redirectRegex.regex=^https://(www\\.lure\\.sh|lure\\.elara\\.ws)",
+          "traefik.http.middlewares.lure-redir.redirectRegex.replacement=https://lure.sh",
+          "traefik.http.middlewares.lure-redir.redirectRegex.permanent=true",
+
+          "traefik.http.routers.lure-frontend.rule=Host(`lure.sh`) || Host(`www.lure.sh`) || Host(`lure.elara.ws`)",
+          "traefik.http.routers.lure-frontend.middlewares=lure-redir",
           "traefik.http.routers.lure-frontend.tls.certresolver=letsencrypt",
         ]
       }
     }
   }
-  
+
   constraint {
     attribute = "${attr.cpu.arch}"
-    operator = "set_contains_any"
-    value = "amd64,arm64,riscv64"
+    operator  = "set_contains_any"
+    value     = "amd64,arm64,riscv64"
   }
 }