refactor: changed url path convention

2025-06-15 09:35:12 -05:00 · 2025-06-10 15:54:00 -05:00 · 2025-06-10 15:54:00 -05:00 · 0c1d86e494
commit 0c1d86e494
parent a35076c0fe
25 changed files with 67 additions and 11 deletions
--- a/modules/config/instances/config/audiobookshelf.nix
+++ b/modules/config/instances/config/audiobookshelf.nix
@ -9,6 +9,7 @@ let
    sopsPath
    ;
  audiobookshelfSubdomain = "books";
+  audiobookshelfDomain = "${audiobookshelfSubdomain}.${domain0}";
 in
 {
  label = audiobookshelfLabel;
@ -16,6 +17,9 @@ in
  sops = {
    path0 = "${sopsPath}/${audiobookshelfName}";
  };
+  domains = {
+    url0 = audiobookshelfDomain;
+  };
  subdomain = audiobookshelfSubdomain;
  paths = {
    path0 = "${servicePath}/${audiobookshelfLabel}";
--- a/modules/config/instances/config/forgejo.nix
+++ b/modules/config/instances/config/forgejo.nix
@ -10,6 +10,7 @@ let
  forgejoLabel = "Forgejo";
  forgejoName = "forgejo";
  forgejoSubdomain = "source";
+  forgejoDomain = "${forgejoSubdomain}.${domain3}";
 in
 {
  label = forgejoLabel;
@ -20,6 +21,9 @@ in
  sops = {
    path0 = "${sopsPath}/${forgejoName}";
  };
+  domains = {
+    url0 = forgejoDomain;
+  };
  subdomain = forgejoSubdomain;
  paths = {
    path0 = "${servicePath}/${forgejoLabel}";
--- a/modules/config/instances/config/glance.nix
+++ b/modules/config/instances/config/glance.nix
@ -10,6 +10,7 @@ let
  glanceLabel = "Glance";
  glanceName = "glance";
  glanceSubdomain = "dashboard";
+  glanceDomain = "${glanceSubdomain}.${domain0}";
 in
 {
  label = glanceLabel;
@ -20,6 +21,9 @@ in
  sops = {
    path0 = "${sopsPath}/${glanceName}";
  };
+  domains = {
+    url0 = glanceDomain;
+  };
  subdomain = glanceSubdomain;
  paths = {
    path0 = "${servicePath}/${glanceLabel}";
--- a/modules/config/instances/config/jellyfin.nix
+++ b/modules/config/instances/config/jellyfin.nix
@ -8,6 +8,7 @@ let
    sslPath
    sopsPath
    ;
+  jellyfinDomain = "${jellyfinName}.${domain0}";
 in
 {
  label = jellyfinLabel;
@ -15,6 +16,9 @@ in
  sops = {
    path0 = "${sopsPath}/${jellyfinName}";
  };
+  domains = {
+    url0 = jellyfinDomain;
+  };
  subdomain = jellyfinName;
  paths = {
    path0 = "${servicePath}/${jellyfinLabel}";
--- a/modules/config/instances/config/kanboard.nix
+++ b/modules/config/instances/config/kanboard.nix
@ -10,6 +10,7 @@ let
  kanboardLabel = "Kanboard";
  kanboardName = "kanboard";
  kanboardSubdomain = "todo";
+  kanboardDomain = "${kanboardSubdomain}.${domain0}";
 in
 {
  label = kanboardLabel;
@ -20,6 +21,9 @@ in
  sops = {
    path0 = "${sopsPath}/${kanboardName}";
  };
+  domains = {
+    url0 = kanboardDomain;
+  };
  subdomain = kanboardSubdomain;
  paths = {
    path0 = "${servicePath}/${kanboardLabel}";
--- a/modules/config/instances/config/mastodon.nix
+++ b/modules/config/instances/config/mastodon.nix
@ -10,6 +10,7 @@ let
  mastodonLabel = "Mastodon";
  mastodonName = "mastodon";
  mastodonSubdomain = "social";
+  mastodonDomain = "${mastodonSubdomain}.${domain3}";
 in
 {
  label = mastodonLabel;
@ -17,6 +18,9 @@ in
  email = {
    address0 = "noreply@${domain3}";
  };
+  domains = {
+    url0 = mastodonDomain;
+  };
  subdomain = mastodonSubdomain;
  sops = {
    path0 = "${sopsPath}/${mastodonName}";
--- a/modules/config/instances/config/nextcloud.nix
+++ b/modules/config/instances/config/nextcloud.nix
@ -9,6 +9,7 @@ let

  nextcloudLabel = "Nextcloud";
  nextcloudName = "nextcloud";
+  nextcloudDomain = "${nextcloudName}.${domain0}";
 in
 {
  label = nextcloudLabel;
@ -19,6 +20,9 @@ in
  sops = {
    path0 = "${sopsPath}/${nextcloudName}";
  };
+  domains = {
+    url0 = nextcloudDomain;
+  };
  subdomain = nextcloudName;
  paths = {
    path0 = "${servicePath}/${nextcloudLabel}";
--- a/modules/config/instances/config/ollama.nix
+++ b/modules/config/instances/config/ollama.nix
@ -9,6 +9,7 @@ let

  ollamaLabel = "Ollama";
  ollamaName = "ollama";
+  ollamaDomain = "${ollamaName}.${domain0}";
 in
 {
  label = ollamaLabel;
@ -16,6 +17,9 @@ in
  sops = {
    path0 = "${sopsPath}/${ollamaName}";
  };
+  domains = {
+    url0 = ollamaDomain;
+  };
  subdomain = ollamaName;
  paths = {
    path0 = "${servicePath}/${ollamaLabel}";
--- a/modules/config/instances/config/owncast.nix
+++ b/modules/config/instances/config/owncast.nix
@ -10,6 +10,7 @@ let
  owncastLabel = "Owncast";
  owncastName = "owncast";
  owncastSubdomain = "stream";
+  owncastDomain = "${owncastSubdomain}.${domain1}";
 in
 {
  label = owncastLabel;
@ -17,6 +18,9 @@ in
  sops = {
    path0 = "${sopsPath}/${owncastName}";
  };
+  domains = {
+    url0 = owncastDomain;
+  };
  subdomain = owncastSubdomain;
  paths = {
    path0 = "${servicePath}/${owncastLabel}";
--- a/modules/config/instances/config/peertube.nix
+++ b/modules/config/instances/config/peertube.nix
@ -10,6 +10,7 @@ let
  peertubeLabel = "PeerTube";
  peertubeName = "peertube";
  peertubeSubdomain = "video";
+  peertubeDomain = "${peertubeSubdomain}.${domain3}";
 in
 {
  label = peertubeLabel;
@ -20,6 +21,9 @@ in
  sops = {
    path0 = "${sopsPath}/${peertubeName}";
  };
+  domains = {
+    url0 = peertubeDomain;
+  };
  subdomain = peertubeSubdomain;
  paths = {
    path0 = "${servicePath}/${peertubeLabel}";
--- a/modules/config/instances/config/postfix.nix
+++ b/modules/config/instances/config/postfix.nix
@ -9,6 +9,7 @@ let

  postfixLabel = "Postfix";
  postfixName = "postfix";
+  postfixDomain = "${postfixName}.${domain3}";
 in
 {
  label = postfixLabel;
@ -16,6 +17,9 @@ in
  sops = {
    path0 = "${sopsPath}/${postfixName}";
  };
+  domains = {
+    url0 = postfixDomain;
+  };
  subdomain = postfixName;
  paths = {
    path0 = "${servicePath}/${postfixLabel}";
--- a/modules/config/instances/config/searx.nix
+++ b/modules/config/instances/config/searx.nix
@ -10,6 +10,7 @@ let
  searxLabel = "SearXNG";
  searxName = "searx";
  searxSubdomain = "search";
+  searxDomain = "${searxSubdomain}.${domain0}";
 in
 {
  label = searxLabel;
@ -20,6 +21,9 @@ in
  sops = {
    path0 = "${sopsPath}/${searxName}";
  };
+  domains = {
+    url0 = searxDomain;
+  };
  subdomain = searxSubdomain;
  paths = {
    path0 = "${servicePath}/${searxLabel}";
--- a/modules/config/instances/config/syncthing.nix
+++ b/modules/config/instances/config/syncthing.nix
@ -8,6 +8,7 @@ let

  syncthingLabel = "Syncthing";
  syncthingName = "syncthing";
+  syncthingDomain = "${syncthingName}.${domain0}";
 in
 {
  label = syncthingLabel;
@ -15,6 +16,9 @@ in
  sops = {
    path0 = "${sopsPath}/${syncthingName}";
  };
+  domains = {
+    url0 = syncthingDomain;
+  };
  subdomain = syncthingName;
  ports = {
    port0 = 8388; # Syncthing (WebUI)
--- a/modules/config/instances/config/vaultwarden.nix
+++ b/modules/config/instances/config/vaultwarden.nix
@ -9,6 +9,7 @@ let

  vaultwardenLabel = "Vaultwarden";
  vaultwardenName = "vaultwarden";
+  vaultwardenDomain = "${vaultwardenName}.${domain0}";
 in
 {
  label = vaultwardenLabel;
@ -19,6 +20,9 @@ in
  sops = {
    path0 = "${sopsPath}/${vaultwardenName}";
  };
+  domains = {
+    url0 = vaultwardenDomain;
+  };
  subdomain = vaultwardenName;
  paths = {
    path0 = "${servicePath}/${vaultwardenLabel}/BackupDir";
--- a/modules/nixos/services/audiobookshelf/default.nix
+++ b/modules/nixos/services/audiobookshelf/default.nix
@ -3,7 +3,7 @@ let
  inherit (flake.config.services.instances) audiobookshelf web;
  inherit (flake.config.machines.devices) ceres;
  service = audiobookshelf;
-  host = "${service.subdomain}.${web.domains.url0}";
+  host = service.domains.url0;
  localhost = web.localhost.address0;
 in
 {
--- a/modules/nixos/services/forgejo/default.nix
+++ b/modules/nixos/services/forgejo/default.nix
@ -10,7 +10,7 @@ let
  inherit (flake.config.services.instances) smtp forgejo web;
  service = forgejo;
  localhost = web.localhost.address0;
-  host = "${service.subdomain}.${web.domains.url3}";
+  host = service.domains.url0;
 in
 {
  services = {
--- a/modules/nixos/services/jellyfin/default.nix
+++ b/modules/nixos/services/jellyfin/default.nix
@ -5,7 +5,7 @@ let
  inherit (flake.config.services.instances) jellyfin web;
  service = jellyfin;
  localhost = web.localhost.address0;
-  host = "${service.subdomain}.${web.domains.url0}";
+  host = service.domains.url0;
 in
 {
  services = {
--- a/modules/nixos/services/kanboard/default.nix
+++ b/modules/nixos/services/kanboard/default.nix
@ -10,7 +10,7 @@ let
  inherit (flake.config.services.instances) smtp kanboard web;
  service = kanboard;
  localhost = web.localhost.address0;
-  host = "${service.subdomain}.${web.domains.url0}";
+  host = service.domains.url0;
 in
 {
  services = {
--- a/modules/nixos/services/mastodon/default.nix
+++ b/modules/nixos/services/mastodon/default.nix
@ -11,7 +11,7 @@ let
    ;
  inherit (flake.config.services.instances) smtp mastodon web;
  service = mastodon;
-  host = "${mastodon.subdomain}.${web.domains.url3}";
+  host = service.domains.url0;
  localhost = web.localhost.address0;
 in
 {
--- a/modules/nixos/services/nextcloud/default.nix
+++ b/modules/nixos/services/nextcloud/default.nix
@ -16,7 +16,7 @@ let
    ;
  service = nextcloud;
  localhost = web.localhost.address0;
-  host = "${service.subdomain}.${web.domains.url0}";
+  host = service.domains.url0;
 in
 {
  services = {
--- a/modules/nixos/services/ollama/default.nix
+++ b/modules/nixos/services/ollama/default.nix
@ -17,7 +17,7 @@ let
  localhost1 = web.localhost.address0;
  localhost2 = web.localhost.address1;
  hostname = config.networking.hostName;
-  host = "${service.subdomain}.${web.domains.url0}";
+  host = service.domains.url0;

  localhostLogic = if hostname == mars.name then localhost2 else localhost1;
  caddyLogic =
--- a/modules/nixos/services/owncast/default.nix
+++ b/modules/nixos/services/owncast/default.nix
@ -6,7 +6,7 @@ let
    ;
  service = owncast;
  localhost = web.localhost.address1;
-  host = "${service.subdomain}.${web.domains.url1}";
+  host = service.domains.url0;
 in
 {
  services = {
--- a/modules/nixos/services/peertube/default.nix
+++ b/modules/nixos/services/peertube/default.nix
@ -16,7 +16,7 @@ let
    ;
  service = peertube;
  localhost = web.localhost.address0;
-  host = "${service.subdomain}.${web.domains.url3}";
+  host = service.domains.url0;
 in
 {
  services = {
--- a/modules/nixos/services/searx/default.nix
+++ b/modules/nixos/services/searx/default.nix
@ -10,7 +10,7 @@ let
  service = searx;
  hostname = config.networking.hostName;
  localhost = web.localhost.address0;
-  host = "${service.subdomain}.${web.domains.url0}";
+  host = service.domains.url0;
 in
 {
  services =
--- a/modules/nixos/services/vaultwarden/default.nix
+++ b/modules/nixos/services/vaultwarden/default.nix
@ -7,7 +7,7 @@ let
  inherit (flake.config.services.instances) smtp vaultwarden web;
  service = vaultwarden;
  localhost = web.localhost.address0;
-  host = "${service.subdomain}.${web.domains.url0}";
+  host = service.domains.url0;
 in
 {
  services = {