oceanbox/platform
6
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: fix merge errors

Browse Source
This commit is contained in:
Administrator
2025-11-18 14:19:23 +01:00
parent 84e730b580
commit 0c25e3c660
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ekman/default.nix
View File

@@ -110,7 +110,7 @@ let
"10.255.241.99"
];
search = [ "ekman.tos.obx" ];
extraHosts = import ./hosts.nix;
extraHosts = import ../hosts.nix + import ./hosts.nix;
firewall.extraCommands = ''
iptables -I INPUT -s 10.255.241.0/24 -j ACCEPT
iptables -I INPUT -s 10.255.243.0/24 -j ACCEPT
@@ -151,7 +151,7 @@ let
client = true;
clusterName = "ekman";
slurmctldHosts = [
"rossby-manage(172.16.239.221)"
"ekman-manage(10.255.241.99)"
];
dbdHost = "slurm-accounting";
mungeKey = ../munge.key;