From 804ffc9554cd33d7610eeea05e571fa7d44edadb Mon Sep 17 00:00:00 2001 From: chn Date: Sun, 7 Sep 2025 16:58:52 +0800 Subject: [PATCH] devices.nas: remove yumieko --- devices/nas/default.nix | 1 - devices/vps6/default.nix | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/devices/nas/default.nix b/devices/nas/default.nix index 8822f39a..b2453810 100644 --- a/devices/nas/default.nix +++ b/devices/nas/default.nix @@ -70,7 +70,6 @@ inputs: # open-webui.ollamaHost = "192.168.83.3"; nixvirt = {}; }; - user.users = [ "chn" "yumieko" ]; }; systemd.tmpfiles.rules = [ "w /sys/class/powercap/intel-rapl/intel-rapl:0/constraint_0_power_limit_uw - - - - 10000000" ]; diff --git a/devices/vps6/default.nix b/devices/vps6/default.nix index 6b7359fa..f131f1de 100644 --- a/devices/vps6/default.nix +++ b/devices/vps6/default.nix @@ -71,15 +71,11 @@ inputs: content = let srv2 = inputs.topInputs.self.config.dns."chn.moe".getAddress "wg0.srv2-node0"; - nas = inputs.topInputs.self.config.dns."chn.moe".getAddress "wg0.nas"; in '' chain prerouting { type nat hook prerouting priority dstnat; policy accept; tcp dport 7011 fib daddr type local counter meta mark set meta mark | 4 dnat ip to ${srv2}:22 - tcp dport 7012 fib daddr type local counter meta mark set meta mark | 4 dnat ip to ${nas}:22 - tcp dport 5695 fib daddr type local counter meta mark set meta mark | 4 dnat ip to ${nas}:5695 - tcp dport 15906 fib daddr type local counter meta mark set meta mark | 4 dnat ip to ${nas}:15906 } chain output { type nat hook output priority dstnat; policy accept; @@ -87,15 +83,6 @@ inputs: meta skgid != ${builtins.toString inputs.config.users.groups.nginx.gid} \ tcp dport 7011 fib daddr type local \ counter meta mark set meta mark | 4 dnat ip to ${srv2}:22 - meta skgid != ${builtins.toString inputs.config.users.groups.nginx.gid} \ - tcp dport 7012 fib daddr type local \ - counter meta mark set meta mark | 4 dnat ip to ${nas}:22 - meta skgid != ${builtins.toString inputs.config.users.groups.nginx.gid} \ - tcp dport 5695 fib daddr type local \ - counter meta mark set meta mark | 4 dnat ip to ${nas}:5695 - meta skgid != ${builtins.toString inputs.config.users.groups.nginx.gid} \ - tcp dport 15906 fib daddr type local \ - counter meta mark set meta mark | 4 dnat ip to ${nas}:15906 } chain postrouting { type nat hook postrouting priority srcnat; policy accept;