From 1f776ec51dd47133cbcf488c7dc0f9f87f335e54 Mon Sep 17 00:00:00 2001 From: jasmine Date: Fri, 22 Nov 2024 07:15:34 +0800 Subject: [PATCH] migrate internal domain to home.arpa --- home-manager/sajenim/features/cli/default.nix | 4 +-- .../viridian/multimedia/jellyfin/default.nix | 2 +- nixos/viridian/multimedia/lidarr/default.nix | 2 +- .../viridian/multimedia/prowlarr/default.nix | 2 +- .../multimedia/qbittorrent/default.nix | 2 +- nixos/viridian/multimedia/radarr/default.nix | 2 +- nixos/viridian/multimedia/sonarr/default.nix | 2 +- nixos/viridian/services/minecraft/default.nix | 2 +- nixos/viridian/services/mpd/default.nix | 2 +- .../services/paperless-ngx/default.nix | 2 +- nixos/viridian/services/traefik/default.nix | 7 ------ nixos/viridian/services/traefik/routers.nix | 25 ------------------- nixos/viridian/services/traefik/services.nix | 7 ------ 13 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 nixos/viridian/services/traefik/routers.nix delete mode 100644 nixos/viridian/services/traefik/services.nix diff --git a/home-manager/sajenim/features/cli/default.nix b/home-manager/sajenim/features/cli/default.nix index 555d138..9b2a39f 100644 --- a/home-manager/sajenim/features/cli/default.nix +++ b/home-manager/sajenim/features/cli/default.nix @@ -8,13 +8,13 @@ programs.ssh = { enable = true; matchBlocks."viridian" = { - hostname = "viridian.kanto.dev"; + hostname = "viridian.home.arpa"; identityFile = "/home/sajenim/.ssh/sajenim_sk"; port = 22; }; matchBlocks."lavender" = { - hostname = "lavender.kanto.dev"; + hostname = "lavender.home.arpa"; identityFile = "/home/sajenim/.ssh/sajenim_sk"; port = 22; }; diff --git a/nixos/viridian/multimedia/jellyfin/default.nix b/nixos/viridian/multimedia/jellyfin/default.nix index 480e68c..b1d2e77 100644 --- a/nixos/viridian/multimedia/jellyfin/default.nix +++ b/nixos/viridian/multimedia/jellyfin/default.nix @@ -33,7 +33,7 @@ in { services.traefik.dynamicConfigOptions.http.routers = { jellyfin = { - rule = "Host(`jellyfin.kanto.dev`)"; + rule = "Host(`jellyfin.home.arpa`)"; entryPoints = [ "websecure" ]; diff --git a/nixos/viridian/multimedia/lidarr/default.nix b/nixos/viridian/multimedia/lidarr/default.nix index e2f9820..12b955e 100644 --- a/nixos/viridian/multimedia/lidarr/default.nix +++ b/nixos/viridian/multimedia/lidarr/default.nix @@ -27,7 +27,7 @@ in { services.traefik.dynamicConfigOptions.http.routers = { lidarr = { - rule = "Host(`lidarr.kanto.dev`)"; + rule = "Host(`lidarr.home.arpa`)"; entryPoints = [ "websecure" ]; diff --git a/nixos/viridian/multimedia/prowlarr/default.nix b/nixos/viridian/multimedia/prowlarr/default.nix index 011713f..3714cd2 100644 --- a/nixos/viridian/multimedia/prowlarr/default.nix +++ b/nixos/viridian/multimedia/prowlarr/default.nix @@ -24,7 +24,7 @@ in { }; services.traefik.dynamicConfigOptions.http.routers = { prowlarr = { - rule = "Host(`prowlarr.kanto.dev`)"; + rule = "Host(`prowlarr.home.arpa`)"; entryPoints = [ "websecure" ]; diff --git a/nixos/viridian/multimedia/qbittorrent/default.nix b/nixos/viridian/multimedia/qbittorrent/default.nix index 5ad3fee..162d6c2 100644 --- a/nixos/viridian/multimedia/qbittorrent/default.nix +++ b/nixos/viridian/multimedia/qbittorrent/default.nix @@ -27,7 +27,7 @@ in { services.traefik.dynamicConfigOptions.http.routers = { qbittorrent = { - rule = "Host(`qbittorrent.kanto.dev`)"; + rule = "Host(`qbittorrent.home.arpa`)"; entryPoints = [ "websecure" ]; diff --git a/nixos/viridian/multimedia/radarr/default.nix b/nixos/viridian/multimedia/radarr/default.nix index 95ac698..7f66254 100644 --- a/nixos/viridian/multimedia/radarr/default.nix +++ b/nixos/viridian/multimedia/radarr/default.nix @@ -26,7 +26,7 @@ in { }; services.traefik.dynamicConfigOptions.http.routers = { radarr = { - rule = "Host(`radarr.kanto.dev`)"; + rule = "Host(`radarr.home.arpa`)"; entryPoints = [ "websecure" ]; diff --git a/nixos/viridian/multimedia/sonarr/default.nix b/nixos/viridian/multimedia/sonarr/default.nix index be12dcd..69b0cdb 100644 --- a/nixos/viridian/multimedia/sonarr/default.nix +++ b/nixos/viridian/multimedia/sonarr/default.nix @@ -27,7 +27,7 @@ in { services.traefik.dynamicConfigOptions.http.routers = { sonarr = { - rule = "Host(`sonarr.kanto.dev`)"; + rule = "Host(`sonarr.home.arpa`)"; entryPoints = [ "websecure" ]; diff --git a/nixos/viridian/services/minecraft/default.nix b/nixos/viridian/services/minecraft/default.nix index 1203bbb..d5d1070 100644 --- a/nixos/viridian/services/minecraft/default.nix +++ b/nixos/viridian/services/minecraft/default.nix @@ -81,7 +81,7 @@ in { services.traefik.dynamicConfigOptions.http.routers = { minecraft = { - rule = "Host(`minecraft.kanto.dev`)"; + rule = "Host(`minecraft.home.arpa`)"; entryPoints = [ "websecure" ]; diff --git a/nixos/viridian/services/mpd/default.nix b/nixos/viridian/services/mpd/default.nix index 2370e7d..41cec3c 100644 --- a/nixos/viridian/services/mpd/default.nix +++ b/nixos/viridian/services/mpd/default.nix @@ -21,7 +21,7 @@ statdPort = 4000; extraNfsdConfig = ''''; exports = '' - /srv/multimedia/library/music fuchsia.kanto.dev(rw,nohide,insecure,no_subtree_check) + /srv/multimedia/library/music fuchsia.home.arpa(rw,nohide,insecure,no_subtree_check) ''; }; networking.firewall = { diff --git a/nixos/viridian/services/paperless-ngx/default.nix b/nixos/viridian/services/paperless-ngx/default.nix index e04d79a..64f9faf 100644 --- a/nixos/viridian/services/paperless-ngx/default.nix +++ b/nixos/viridian/services/paperless-ngx/default.nix @@ -18,7 +18,7 @@ in { services.traefik.dynamicConfigOptions.http.routers = { paperless-ngx = { - rule = "Host(`docs.kanto.dev`)"; + rule = "Host(`docs.home.arpa`)"; entryPoints = [ "websecure" ]; diff --git a/nixos/viridian/services/traefik/default.nix b/nixos/viridian/services/traefik/default.nix index 3bba7fc..8e7f782 100644 --- a/nixos/viridian/services/traefik/default.nix +++ b/nixos/viridian/services/traefik/default.nix @@ -8,9 +8,7 @@ imports = [ "${inputs.nixpkgs-unstable}/nixos/modules/services/web-servers/traefik.nix" - ./routers.nix ./middlewares.nix - ./services.nix ]; age.secrets.traefik = { @@ -88,11 +86,6 @@ certResolver = "lets-encrypt"; # List of domains in our network domains = [ - # Internal services - { - main = "kanto.dev"; - sans = ["*.kanto.dev"]; - } # Public services { main = "sajenim.dev"; diff --git a/nixos/viridian/services/traefik/routers.nix b/nixos/viridian/services/traefik/routers.nix deleted file mode 100644 index 82e5cca..0000000 --- a/nixos/viridian/services/traefik/routers.nix +++ /dev/null @@ -1,25 +0,0 @@ -{...}: { - services.traefik.dynamicConfigOptions.http.routers = { - traefik-dashboard = { - rule = "Host(`traefik.kanto.dev`)"; - entryPoints = [ - "websecure" - ]; - middlewares = [ - "internal" - ]; - service = "api@internal"; - }; - - ender1 = { - rule = "Host(`e1.kanto.dev`)"; - entryPoints = [ - "websecure" - ]; - middlewares = [ - "internal" - ]; - service = "ender1"; - }; - }; -} diff --git a/nixos/viridian/services/traefik/services.nix b/nixos/viridian/services/traefik/services.nix deleted file mode 100644 index 7a9f665..0000000 --- a/nixos/viridian/services/traefik/services.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - services.traefik.dynamicConfigOptions.http.services = { - ender1.loadBalancer.servers = [ - {url = "http://192.168.50.202:80";} - ]; - }; -}