From 06dc25c9832e3bfd905d1d616e6a3e8e08af7ea5 Mon Sep 17 00:00:00 2001
From: beatzaplenty <wayne.bennett@live.com>
Date: Mon, 13 Jul 2026 02:00:55 +1000
Subject: [PATCH] modularized rpcbind enable and added to server config

---
 hosts/docker/configuration.nix      | 3 ++-
 hosts/server/configuration.nix      | 9 +++++----
 modules/services/enable-rpcbind.nix | 4 ++++
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 modules/services/enable-rpcbind.nix

diff --git a/hosts/docker/configuration.nix b/hosts/docker/configuration.nix
index 5046207..bd16de7 100644
--- a/hosts/docker/configuration.nix
+++ b/hosts/docker/configuration.nix
@@ -17,6 +17,7 @@
       ../../modules/raspi/mount-data.nix
       ../../modules/services/nextcloud-cron-job.nix
       ../../modules/services/docker-health-to-gotify.nix
+      ../../modules/services/enable-rpcbind.nix
     ];
 
 
@@ -27,7 +28,7 @@
     nfs-utils
     ];
   boot.supportedFilesystems = [ "nfs" ];
-  services.rpcbind.enable = true;
+  #services.rpcbind.enable = true;
   systemd.tmpfiles.rules = [
     "L+ /home/nixos/docker - - - - /mnt/docker/config"
     "d /mnt/docker 0755 nixos users -"
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index fad7a0f..c16b42c 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -10,11 +10,12 @@
     imports =
     [ # Include the results of the hardware scan.
       ../../common/configuration.nix
-      ../../modules/nix/cache-client.nix
-      ../../modules/nix/remote-builder-client.nix
+      ../../modules/nix-cache/client.nix
+      ../../modules/remote-builder-client.nix
 #      ../../modules/nix/tailscale-exit-node.nix
 #      ../../modules/nix/enable-ip-forwarding.nix
-      ../../modules/nix/beszel-agent.nix
+      ../../modules/beszel/enable-agent.nix
+      ../../modules/services/enable-rpcbind.nix
     ];
 
     
@@ -162,7 +163,7 @@ services.nfs.server = {
 
 #  services.openssh.settings.PermitRootLogin = "yes";
   # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 2049 111 ];
+  networking.firewall.allowedTCPPorts = [ 2049 ];
 #  networking.firewall.allowedUDPPorts = [ 111 2049 20048 ];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
diff --git a/modules/services/enable-rpcbind.nix b/modules/services/enable-rpcbind.nix
new file mode 100644
index 0000000..b691b3f
--- /dev/null
+++ b/modules/services/enable-rpcbind.nix
@@ -0,0 +1,4 @@
+ { ... }
+ {
+ services.rpcbind.enable = true;
+ }
\ No newline at end of file