From aed78a7aa708a44b669138d79ea512c1db87bd49 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Sat, 12 Apr 2025 23:57:49 +0800
Subject: [PATCH] modules.services.slurm: remove setupFirewall option

---
 devices/srv1/default.nix   | 1 -
 modules/services/slurm.nix | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/devices/srv1/default.nix b/devices/srv1/default.nix
index 5970ef3c..79c75a1d 100644
--- a/devices/srv1/default.nix
+++ b/devices/srv1/default.nix
@@ -60,7 +60,6 @@ inputs:
             { name = "n0"; mpiThreads = 8; openmpThreads = 10; }
             { name = "n1"; mpiThreads = 8; openmpThreads = 4; }
           ];
-          setupFirewall = true;
         };
       };
       user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" "wm" "GROUPIII-1" "GROUPIII-2" "GROUPIII-3" ];
diff --git a/modules/services/slurm.nix b/modules/services/slurm.nix
index c5eda575..79215596 100644
--- a/modules/services/slurm.nix
+++ b/modules/services/slurm.nix
@@ -44,8 +44,6 @@ inputs:
         default = null;
       };
     };
-    # 是否打开防火墙相应端口，对于多节点部署需要打开
-    setupFirewall = mkOption { type = types.bool; default = false; };
   };
   config = let inherit (inputs.config.nixos.services) slurm; in inputs.lib.mkIf slurm.enable (inputs.lib.mkMerge
   [
@@ -196,9 +194,6 @@ inputs:
           "${inputs.config.nixos.system.sops.clusterSopsDir}/munge.key";
         owner = inputs.config.systemd.services.munged.serviceConfig.User;
       };
-      networking.firewall =
-        let config = inputs.lib.mkIf slurm.setupFirewall [ 6818 ];
-        in { allowedTCPPorts = config; allowedUDPPorts = config; };
       environment.sessionVariables = { SLURM_UNBUFFEREDIO = "1"; SLURM_CPU_BIND = "v"; };
     }
     # master 配置
@@ -302,9 +297,6 @@ inputs:
         ];}];
         services.mariadb = { enable = true; instances.slurm = {}; };
       };
-      networking.firewall =
-        let config = inputs.lib.mkIf slurm.setupFirewall [ 6817 ];
-        in { allowedTCPPorts = config; allowedUDPPorts = config; };
     })
   ]);
 }