diff --git a/modules/containers/3x-ui.nix b/modules/containers/3x-ui.nix index 6c145b4..fe28152 100644 --- a/modules/containers/3x-ui.nix +++ b/modules/containers/3x-ui.nix @@ -46,7 +46,7 @@ in oci-containers = { backend = "podman"; containers."3xui_app" = { - image = "ghcr.io/mhsanaei/3x-ui:v3.8.5"; + image = "ghcr.io/mhsanaei/3x-ui:latest"; environment = { "XRAY_VMESS_AEAD_FORCED" = "false"; "XUI_ENABLE_FAIL2BAN" = "true"; @@ -89,13 +89,13 @@ in unitConfig.Description = "Root target generated by compose2nix."; wantedBy = [ "multi-user.target" ]; }; - timers."podman-update-3xui_app" = { - wantedBy = [ "timers.target" ]; - timerConfig = { - OnCalendar = "weekly"; - Persistent = true; - }; - }; + # timers."podman-update-3xui_app" = { + # wantedBy = [ "timers.target" ]; + # timerConfig = { + # OnCalendar = "weekly"; + # Persistent = true; + # }; + # }; tmpfiles.rules = [ (xlib.helpers.mkTmpfile "d" xlib.dirs.services-mnt-folder "0755" "root" "root") (xlib.helpers.mkTmpfile "d" xlib.dirs.services-nodes-folder "0755" "root" "root") diff --git a/modules/server/glances.nix b/modules/server/glances.nix index 237650c..049af23 100644 --- a/modules/server/glances.nix +++ b/modules/server/glances.nix @@ -10,6 +10,9 @@ enable = true; openFirewall = true; port = 61208; + extraArgs = [ + "--bind 100.64.0.0" + ]; }; }; } diff --git a/modules/vds/default.nix b/modules/vds/default.nix index aa40996..be108aa 100644 --- a/modules/vds/default.nix +++ b/modules/vds/default.nix @@ -11,7 +11,6 @@ ./systemd.nix # ./glances.nix # ./netbird.nix - # ./xray.nix ]; # VDS hosts the public-facing Xray REALITY inbound on container:443, # fronted by nginx stream on host:443 → host:15380 → container:443. diff --git a/modules/vds/glances.nix b/modules/vds/glances.nix index 237650c..c8d85d1 100644 --- a/modules/vds/glances.nix +++ b/modules/vds/glances.nix @@ -10,6 +10,9 @@ enable = true; openFirewall = true; port = 61208; + extraArgs = [ + "--bind 100.64.1.0" + ]; }; }; } diff --git a/modules/vds/xray.nix b/modules/vds/xray.nix deleted file mode 100644 index 11ad406..0000000 --- a/modules/vds/xray.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - config, - inputs, - pkgs, - ... -}: -{ - services.xray = { - enable = false; - settings = inputs.zeroq-credentials.services.xray.config; - }; - - # networking.firewall = { - # allowedTCPPorts = [ - # 8443 - # 9443 - # 13380 - # ]; - # allowedUDPPorts = [ - # 8443 - # 9443 - # 13380 - # ]; - # }; - - environment.systemPackages = [ pkgs.xray ]; - - # sops.secrets = { - # xray_uuid = { - # key = "uuid"; - # mode = "0444"; - # format = "yaml"; - # sopsFile = ./secrets/xray.yaml; - # path = "/etc/xray/uuid"; - # }; - # xray_private-key = { - # path = "/etc/xray/private-key"; - # key = "private-key"; - # mode = "0444"; - # format = "yaml"; - # sopsFile = ./secrets/xray.yaml; - # }; - # }; -}