Merge pull request #657 from genebean/ports-module-remaining-hosts

Extend dots.ports module to remaining NixOS hosts

modules/hosts/nixos/bigboy/default.nix

@@ -17,6 +17,7 @@ in
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ../../../shared/linux/flatpaks.nix
+    ../../../shared/nixos/ports.nix
     ../../../shared/nixos/ripping.nix
   ];
 

modules/hosts/nixos/hetznix02/default.nix

@@ -1,5 +1,7 @@
 {
+  config,
   inputs,
+  lib,
   pkgs,
   username,
   ...
@@ -7,6 +9,7 @@
 {
   imports = [
     ../../../shared/nixos/nixroutes.nix
+    ../../../shared/nixos/ports.nix
     ./disk-config.nix
     ./hardware-configuration.nix
     ./post-install
@@ -33,15 +36,18 @@
   ];
 
   networking = {
-    # Open ports in the firewall.
+    firewall = {
-    firewall.allowedTCPPorts = [
+      allowedTCPPorts = lib.pipe config.dots.ports [
-      22 # ssh
+        builtins.attrValues
-      80 # Nginx
+        (builtins.filter (e: e.openFirewall && e.protocol == "tcp"))
-      443 # Nginx
+        (map (e: e.port))
       ];
-    # firewall.allowedUDPPorts = [ ... ];
+      allowedUDPPorts = lib.pipe config.dots.ports [
-    # Or disable the firewall altogether.
+        builtins.attrValues
-    # firewall.enable = false;
+        (builtins.filter (e: e.openFirewall && e.protocol == "udp"))
+        (map (e: e.port))
+      ];
+    };
 
     hostId = "89bbb3e6"; # head -c4 /dev/urandom | od -A none -t x4
 

modules/hosts/nixos/hetznix02/post-install/monitoring.nix

@@ -16,7 +16,7 @@ in
           {
             job_name = "node";
             static_configs = [
-              { targets = [ "127.0.0.1:9100" ]; }
+              { targets = [ "127.0.0.1:${toString config.dots.ports.node-exporter.port}" ]; }
             ];
             metric_relabel_configs = [
               {
@@ -37,7 +37,7 @@ in
           {
             job_name = "nginx";
             static_configs = [
-              { targets = [ "127.0.0.1:9113" ]; }
+              { targets = [ "127.0.0.1:${toString config.dots.ports.nginx-exporter.port}" ]; }
             ];
             metric_relabel_configs = [
               {
@@ -84,7 +84,7 @@ in
     prometheus.exporters.node = {
       enable = true;
       listenAddress = "127.0.0.1";
-      port = 9100;
+      inherit (config.dots.ports.node-exporter) port;
       enabledCollectors = [
         "systemd"
       ];
@@ -98,7 +98,7 @@ in
     prometheus.exporters.nginx = {
       enable = true;
       listenAddress = "127.0.0.1";
-      port = 9113;
+      inherit (config.dots.ports.nginx-exporter) port;
       scrapeUri = "https://127.0.0.1/server_status";
       sslVerify = false;
     };

modules/hosts/nixos/kiosk-entryway/default.nix

@@ -7,6 +7,7 @@
 }:
 {
   imports = [
+    ../../../shared/nixos/ports.nix
     ./disk-config.nix
     ./hardware-configuration.nix
     ./monitoring.nix

modules/hosts/nixos/kiosk-entryway/monitoring.nix

@@ -16,7 +16,7 @@ in
           {
             job_name = "node";
             static_configs = [
-              { targets = [ "127.0.0.1:9100" ]; }
+              { targets = [ "127.0.0.1:${toString config.dots.ports.node-exporter.port}" ]; }
             ];
             metric_relabel_configs = [
               {
@@ -63,7 +63,7 @@ in
     prometheus.exporters.node = {
       enable = true;
       listenAddress = "127.0.0.1";
-      port = 9100;
+      inherit (config.dots.ports.node-exporter) port;
       extraFlags = [
         "--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|run|tmp|var/lib/docker/.+)($|/)"
         "--collector.diskstats.device-exclude=^(loop|ram|fd|sr|dm-|nvme[0-9]n[0-9]p[0-9]+_crypt)$"

modules/hosts/nixos/kiosk-gene-desk/default.nix

@@ -10,6 +10,7 @@
   imports = [
     # SD card image
     "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
+    ../../../shared/nixos/ports.nix
     ./read-only-root.nix
   ];
 
@@ -92,6 +93,7 @@
       };
     prometheus.exporters.node = {
       enable = true;
+      inherit (config.dots.ports.node-exporter) port;
       enabledCollectors = [
         "logind"
         "systemd"

modules/hosts/nixos/rainbow-planet/default.nix

@@ -9,6 +9,7 @@
   imports = [
     ./hardware-configuration.nix
     ../../../shared/linux/flatpaks.nix
+    ../../../shared/nixos/ports.nix
     ../../../shared/nixos/ripping.nix
   ];