From a34df46bb01c673ffbb5d2f8c404169ba8429afa Mon Sep 17 00:00:00 2001
From: whitney <whitney.server@gmail.com>
Date: Sat, 18 May 2024 00:05:53 -0700
Subject: [PATCH] Add traefik redirect whitney.rip > www.whitney.rip

---
 ...se_BLANKED.yml => docker-compose.yml.blanked} |  0
 traefik/traefik-dynamic-BLANKED.toml             | 13 -------------
 traefik/traefik-dynamic.toml.blanked             | 16 ++++++++++++++++
 ...traefik-BLANKED.toml => traefik.toml.BLANKED} |  0
 4 files changed, 16 insertions(+), 13 deletions(-)
 rename homepage/{docker-compose_BLANKED.yml => docker-compose.yml.blanked} (100%)
 delete mode 100644 traefik/traefik-dynamic-BLANKED.toml
 create mode 100644 traefik/traefik-dynamic.toml.blanked
 rename traefik/{traefik-BLANKED.toml => traefik.toml.BLANKED} (100%)

diff --git a/homepage/docker-compose_BLANKED.yml b/homepage/docker-compose.yml.blanked
similarity index 100%
rename from homepage/docker-compose_BLANKED.yml
rename to homepage/docker-compose.yml.blanked
diff --git a/traefik/traefik-dynamic-BLANKED.toml b/traefik/traefik-dynamic-BLANKED.toml
deleted file mode 100644
index 05731c3..0000000
--- a/traefik/traefik-dynamic-BLANKED.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Whitney Traefik Dynamic Config
-
-[http.middlewares.simpleAuth.basicAuth]
-  users = ["USER_REDACTED:$PASS$WORD_REDACTED"]
-
-[http.routers.api]
-  rule = "Host(`monitor.whitney.rip`)"
-  entrypoints = "websecure"
-  middlewares = ["simpleAuth"]
-  service = "api@internal"
-  [http.routers.api.tls]
-    certResolver = "lets-encrypt"
-
diff --git a/traefik/traefik-dynamic.toml.blanked b/traefik/traefik-dynamic.toml.blanked
new file mode 100644
index 0000000..8ed425d
--- /dev/null
+++ b/traefik/traefik-dynamic.toml.blanked
@@ -0,0 +1,16 @@
+[http.middlewares]
+  [http.middlewares.redirect-to-www.redirectRegex]
+    regex = "^https?://whitney.com(.*)"
+    replacement = "http://www.whitney.com$${1}"
+    permanent = true
+  [http.middlewares.simpleAuth.basicAuth]
+    users = ["olomana:$2y$05$k9MjyAQnhsdUiWY9laCzD.1Ckidw5IcM282RUgmUyOgHHo.YbtGmq"]
+
+[http.routers.api]
+  rule = "Host(`monitor.whitney.rip`)"
+  entrypoints = "websecure"
+  middlewares = ["simpleAuth"]
+  service = "api@internal"
+  [http.routers.api.tls]
+    certResolver = "lets-encrypt"
+
diff --git a/traefik/traefik-BLANKED.toml b/traefik/traefik.toml.BLANKED
similarity index 100%
rename from traefik/traefik-BLANKED.toml
rename to traefik/traefik.toml.BLANKED