Refactor homelab ports

hosts/nixedo/modules/containers/pi-hole.nix

@@ -1,10 +1,11 @@
-{ lib, ... }:
+{ config, lib, ... }:
 
 let
-  port = 8082;
+  service = "pihole";
+  port = config.homelab.ports.${service};
 in
 {
-  virtualisation.oci-containers.containers."pihole" = {
+  virtualisation.oci-containers.containers.${service} = {
     image = "pihole/pihole:latest";
 
     environment = {
@@ -22,7 +23,7 @@ in
       "53:53/tcp"
       "53:53/udp"
       "67:67/udp"
-      "${toString port}:80/tcp"
+      "${port}:80/tcp"
     ];
 
     log-driver = "journald";

hosts/nixedo/modules/containers/tubearchivist.nix

@@ -11,16 +11,13 @@ let
   cfg = homelab.services.${service};
   service = "tubearchivist";
   homelab = config.homelab;
+
+  port = homelab.ports.${service};
 in
 {
   options.homelab.services.${service} = {
     enable = mkEnableOption "Enable ${service}";
 
-    port = mkOption {
-      default = 8099;
-      type = types.port;
-    };
-
     url = mkOption {
       default = "${service}.${homelab.domain}";
       type = types.str;
@@ -177,7 +174,7 @@ in
       ];
 
       ports = [
-        "${toString cfg.port}:8000/tcp"
+        "${toString port}:8000/tcp"
       ];
 
       dependsOn = [
@@ -321,7 +318,7 @@ in
       useACMEHost = homelab.domain;
 
       locations."/" = {
-        proxyPass = "http://localhost:${toString cfg.port}";
+        proxyPass = "http://localhost:${toString port}";
         recommendedProxySettings = true;
         proxyWebsockets = true;
 

hosts/nixedo/modules/nginx/default.nix

@@ -1,7 +1,7 @@
 { config, ... }:
 
 let
-  sites = import ./sites.nix;
+  sites = import ./sites.nix { ports = config.homelab.ports; };
 in
 {
   services = {

hosts/nixedo/modules/nginx/ports.nix

@@ -1,15 +0,0 @@
-{
-  bootstrap-with-tailwind = 8081;
-  eric = 8084;
-  florida-drupalcamp-tailwind-css = 8083;
-  luke = 8094;
-  phpsw-sculpin-demo = 8085;
-  rebuilding-acquia = 8086;
-  rebuilding-bartik = 8087;
-  rebuilding-bristol-js = 8088;
-  rebuilding-symfony = 8089;
-  tailwindcss-demo = 8090;
-  talking-drupal-tailwindcss = 8093;
-  wp-tailwind = 8091;
-  zet = 8092;
-}

hosts/nixedo/modules/nginx/sites.nix

@@ -1,20 +1,14 @@
+{ ports }:
+
 let
-  domain = "oliverdavies.uk";
-
-  ports = import ./ports.nix;
-
   mkSite =
     name: overrides:
     let
       root = "/var/www/vhosts/${name}" + (overrides.rootSuffix or "");
+      port = ports."nginx-${name}";
+      url = "${name}.oliverdavies.uk";
     in
-    {
-      inherit root;
-
-      port = ports.${name};
-      url = "${name}.${domain}";
-    }
-    // overrides;
+    { inherit port root url; } // overrides;
 
   sites = [
     (mkSite "eric" {

hosts/nixedo/modules/nginx/www.oliverdavies.uk.nix

@@ -1,5 +1,8 @@
+{ config, ... }:
+
 let
-  port = 8095;
+  ports = config.homelab.ports;
+  port = ports.nginx-website-sculpin;
 
   redirects = import ./www.oliverdavies.uk-redirects.nix;
 
@@ -18,7 +21,7 @@ let
       "tome-test"
     ];
 
-    port = 8098;
+    port = ports.nginx-website-tome;
   };
 
   tomeLocations = builtins.listToAttrs (