From 9c10fa694db1a8f4a63f72879c27a127b567603f Mon Sep 17 00:00:00 2001 From: blaknull Date: Sun, 10 Nov 2024 14:45:26 -0600 Subject: [PATCH] authentik works! --- flake.lock | 18 ++++++++-------- .../services/containers/traefik/default.nix | 21 ++----------------- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index e471600..375294d 100644 --- a/flake.lock +++ b/flake.lock @@ -1385,11 +1385,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-swUtIf1jN3XSE4xExChj4M5rBWCSs08qqxXsJu1tZYs=", - "path": "/nix/store/6fpz9wjljss6nsip24iy9l691p2z8fs6-source/home-manager", + "path": "/nix/store/9a8cd5lszck766cn37snl7w5qjf34a4l-source/home-manager", "type": "path" }, "original": { - "path": "/nix/store/6fpz9wjljss6nsip24iy9l691p2z8fs6-source/home-manager", + "path": "/nix/store/9a8cd5lszck766cn37snl7w5qjf34a4l-source/home-manager", "type": "path" } }, @@ -2066,11 +2066,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-HAuZ9X84fuwUcit6NWUoJCjHj+29nST/YN6Rs8JQugY=", - "path": "/nix/store/g4jz9h6psl2w8p4k24mxk74dm792vgzi-source/programs", + "path": "/nix/store/ya16wzrcrapfiml8wwygxaqpqvjqc32c-source/programs", "type": "path" }, "original": { - "path": "/nix/store/g4jz9h6psl2w8p4k24mxk74dm792vgzi-source/programs", + "path": "/nix/store/ya16wzrcrapfiml8wwygxaqpqvjqc32c-source/programs", "type": "path" } }, @@ -2142,11 +2142,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-0Ztx5DVQ2I7hvCK/qjGa4XTdRgbzM8rhf19m0al8lVM=", - "path": "/nix/store/g4jz9h6psl2w8p4k24mxk74dm792vgzi-source/services/sddm", + "path": "/nix/store/ya16wzrcrapfiml8wwygxaqpqvjqc32c-source/services/sddm", "type": "path" }, "original": { - "path": "/nix/store/g4jz9h6psl2w8p4k24mxk74dm792vgzi-source/services/sddm", + "path": "/nix/store/ya16wzrcrapfiml8wwygxaqpqvjqc32c-source/services/sddm", "type": "path" } }, @@ -2213,12 +2213,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yL3oskLUrTl8bmNVmBtGOAEZgtIa5lxj+qIZlts7tuI=", - "path": "/nix/store/6fpz9wjljss6nsip24iy9l691p2z8fs6-source/system-config", + "narHash": "sha256-a6apb0B+Ob0NtnxKA/Qsvc25wCwXz+AQRZeYw/7HBQc=", + "path": "/nix/store/9a8cd5lszck766cn37snl7w5qjf34a4l-source/system-config", "type": "path" }, "original": { - "path": "/nix/store/6fpz9wjljss6nsip24iy9l691p2z8fs6-source/system-config", + "path": "/nix/store/9a8cd5lszck766cn37snl7w5qjf34a4l-source/system-config", "type": "path" } }, diff --git a/system-config/services/containers/traefik/default.nix b/system-config/services/containers/traefik/default.nix index 42275a5..a8980e2 100644 --- a/system-config/services/containers/traefik/default.nix +++ b/system-config/services/containers/traefik/default.nix @@ -121,24 +121,7 @@ routers = { homepageSecure = { entryPoints = [ "localsecure" "websecure" ]; - rule = "Host(`blunkall.us`)"; - service = "homepage"; - middlewares = [ - "authentik" - ]; - tls = { - certResolver = "cloudflare"; - domains = { - main = "blunkall.us"; - sans = [ "*.blunkall.us" "*.local.blunkall.us" ]; - }; - }; - }; - - - homepage = { - entryPoints = [ "localsecure" "websecure" ]; - rule = "Host(`www.blunkall.us`)"; + rule = "Host(`blunkall.us`) || Host(`www.blunkall.us`)"; service = "homepage"; middlewares = [ "authentik" @@ -159,7 +142,7 @@ tls = { certResolver = "cloudflare"; domains = { - main = "blunkall.us"; + main = "auth.blunkall.us"; sans = [ "*.blunkall.us" "*.local.blunkall.us" ]; }; };