From 92ded2680606b0e75656d4326ae097e3c70c3550 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 3 May 2025 01:13:51 +0100 Subject: [PATCH] Rename `baseDomain` to `domain` --- hosts/nixedo/homelab.nix | 2 +- hosts/nixedo/modules/audiobookshelf.nix | 4 ++-- hosts/nixedo/modules/containers/tubearchivist.nix | 4 ++-- hosts/nixedo/modules/default.nix | 2 +- hosts/nixedo/modules/forgejo.nix | 2 +- hosts/nixedo/modules/immich.nix | 4 ++-- hosts/nixedo/modules/jellyfin.nix | 4 ++-- hosts/nixedo/modules/nginx/sites.nix | 4 ++-- hosts/nixedo/modules/paperless.nix | 4 ++-- hosts/nixedo/services/homepage/default.nix | 4 ++-- hosts/nixedo/services/uptime-kuma.nix | 4 ++-- hosts/nixedo/services/vaultwarden.nix | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/hosts/nixedo/homelab.nix b/hosts/nixedo/homelab.nix index 0ce92eab..3e07b86b 100644 --- a/hosts/nixedo/homelab.nix +++ b/hosts/nixedo/homelab.nix @@ -6,7 +6,7 @@ features.homelab = { enable = true; - baseDomain = "oliverdavies.uk"; + domain = "oliverdavies.uk"; services = { audiobookshelf.enable = true; diff --git a/hosts/nixedo/modules/audiobookshelf.nix b/hosts/nixedo/modules/audiobookshelf.nix index cd77ab28..5b494839 100644 --- a/hosts/nixedo/modules/audiobookshelf.nix +++ b/hosts/nixedo/modules/audiobookshelf.nix @@ -12,7 +12,7 @@ in enable = mkEnableOption "Enable ${service}"; url = mkOption { - default = "audiobookshelf.${homelab.baseDomain}"; + default = "audiobookshelf.${homelab.domain}"; type = types.str; }; @@ -43,7 +43,7 @@ in nginx.virtualHosts.${cfg.url} = { forceSSL = true; - useACMEHost = homelab.baseDomain; + useACMEHost = homelab.domain; locations."/" = { proxyPass = "http://localhost:${toString config.services.${service}.port}"; diff --git a/hosts/nixedo/modules/containers/tubearchivist.nix b/hosts/nixedo/modules/containers/tubearchivist.nix index 0ad0bb45..95cb26e0 100644 --- a/hosts/nixedo/modules/containers/tubearchivist.nix +++ b/hosts/nixedo/modules/containers/tubearchivist.nix @@ -22,7 +22,7 @@ in }; url = mkOption { - default = "${service}.${homelab.baseDomain}"; + default = "${service}.${homelab.domain}"; type = types.str; }; @@ -318,7 +318,7 @@ in services.nginx.virtualHosts."${cfg.url}" = { forceSSL = true; - useACMEHost = homelab.baseDomain; + useACMEHost = homelab.domain; locations."/" = { proxyPass = "http://localhost:${toString cfg.port}"; diff --git a/hosts/nixedo/modules/default.nix b/hosts/nixedo/modules/default.nix index 2211cebd..f9d47226 100644 --- a/hosts/nixedo/modules/default.nix +++ b/hosts/nixedo/modules/default.nix @@ -6,7 +6,7 @@ with lib; options.features.homelab = { enable = mkEnableOption "Enable homelab services and configuration"; - baseDomain = mkOption { + domain = mkOption { description = "The base domain to use for this homelab."; type = types.str; }; diff --git a/hosts/nixedo/modules/forgejo.nix b/hosts/nixedo/modules/forgejo.nix index 94b31580..be51de4d 100644 --- a/hosts/nixedo/modules/forgejo.nix +++ b/hosts/nixedo/modules/forgejo.nix @@ -12,7 +12,7 @@ in enable = mkEnableOption "Enable ${service}"; url = mkOption { - default = "code.${homelab.baseDomain}"; + default = "code.${homelab.domain}"; type = types.str; }; diff --git a/hosts/nixedo/modules/immich.nix b/hosts/nixedo/modules/immich.nix index c43af72d..76f13072 100644 --- a/hosts/nixedo/modules/immich.nix +++ b/hosts/nixedo/modules/immich.nix @@ -17,7 +17,7 @@ in enable = mkEnableOption "Enable ${service}"; url = mkOption { - default = "photos.${homelab.baseDomain}"; + default = "photos.${homelab.domain}"; type = types.str; }; @@ -52,7 +52,7 @@ in nginx.virtualHosts."${cfg.url}" = { forceSSL = true; - useACMEHost = homelab.baseDomain; + useACMEHost = homelab.domain; locations."/" = { proxyPass = "http://localhost:${toString config.services.immich.port}"; diff --git a/hosts/nixedo/modules/jellyfin.nix b/hosts/nixedo/modules/jellyfin.nix index 2831d9e8..07992fbb 100644 --- a/hosts/nixedo/modules/jellyfin.nix +++ b/hosts/nixedo/modules/jellyfin.nix @@ -12,7 +12,7 @@ in enable = mkEnableOption "Enable ${service}"; url = mkOption { - default = "${service}.${homelab.baseDomain}"; + default = "${service}.${homelab.domain}"; type = types.str; }; @@ -49,7 +49,7 @@ in nginx.virtualHosts."${cfg.url}" = { forceSSL = true; - useACMEHost = homelab.baseDomain; + useACMEHost = homelab.domain; locations."/" = { proxyPass = "http://localhost:8096"; diff --git a/hosts/nixedo/modules/nginx/sites.nix b/hosts/nixedo/modules/nginx/sites.nix index 30b8a1d5..4a982436 100644 --- a/hosts/nixedo/modules/nginx/sites.nix +++ b/hosts/nixedo/modules/nginx/sites.nix @@ -1,5 +1,5 @@ let - baseDomain = "oliverdavies.uk"; + domain = "oliverdavies.uk"; ports = import ./ports.nix; @@ -12,7 +12,7 @@ let inherit root; port = ports.${name}; - url = "${name}.${baseDomain}"; + url = "${name}.${domain}"; } // overrides; diff --git a/hosts/nixedo/modules/paperless.nix b/hosts/nixedo/modules/paperless.nix index 2b5af7bc..6444fd31 100644 --- a/hosts/nixedo/modules/paperless.nix +++ b/hosts/nixedo/modules/paperless.nix @@ -12,7 +12,7 @@ in enable = mkEnableOption "Enable ${service}"; url = mkOption { - default = "${service}.${homelab.baseDomain}"; + default = "${service}.${homelab.domain}"; type = types.str; }; @@ -51,7 +51,7 @@ in nginx.virtualHosts."${cfg.url}" = { forceSSL = true; - useACMEHost = homelab.baseDomain; + useACMEHost = homelab.domain; locations."/" = { proxyPass = "http://localhost:${toString config.services.${service}.port}"; diff --git a/hosts/nixedo/services/homepage/default.nix b/hosts/nixedo/services/homepage/default.nix index c41080e9..26cbc41d 100644 --- a/hosts/nixedo/services/homepage/default.nix +++ b/hosts/nixedo/services/homepage/default.nix @@ -23,7 +23,7 @@ in }; url = mkOption { - default = "${config.networking.hostName}.${homelab.baseDomain}"; + default = "${config.networking.hostName}.${homelab.domain}"; type = types.str; }; }; @@ -64,7 +64,7 @@ in nginx.virtualHosts.${cfg.url} = { forceSSL = true; - useACMEHost = homelab.baseDomain; + useACMEHost = homelab.domain; locations."/".proxyPass = "http://localhost:${toString config.services.homepage-dashboard.listenPort}"; diff --git a/hosts/nixedo/services/uptime-kuma.nix b/hosts/nixedo/services/uptime-kuma.nix index ac761d12..bdda45b5 100644 --- a/hosts/nixedo/services/uptime-kuma.nix +++ b/hosts/nixedo/services/uptime-kuma.nix @@ -12,7 +12,7 @@ in enable = mkEnableOption "Enable ${service}"; url = mkOption { - default = "uptime.${homelab.baseDomain}"; + default = "uptime.${homelab.domain}"; type = types.str; }; @@ -43,7 +43,7 @@ in nginx.virtualHosts.${cfg.url} = { forceSSL = true; - useACMEHost = homelab.baseDomain; + useACMEHost = homelab.domain; locations."/" = { proxyPass = "http://localhost:${toString config.services.${service}.settings.PORT}"; diff --git a/hosts/nixedo/services/vaultwarden.nix b/hosts/nixedo/services/vaultwarden.nix index 53cfba66..fa964665 100644 --- a/hosts/nixedo/services/vaultwarden.nix +++ b/hosts/nixedo/services/vaultwarden.nix @@ -17,7 +17,7 @@ in enable = mkEnableOption "Enable ${service}"; url = mkOption { - default = "${service}.${homelab.baseDomain}"; + default = "${service}.${homelab.domain}"; type = types.str; };