diff --git a/hosts/default.nix b/hosts/default.nix index ed94353..f5625c8 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -200,12 +200,12 @@ in # specialArgs = { }; }; - shadowshocks = nixpkgs.lib.nixosSystem { + shadowsocks = nixpkgs.lib.nixosSystem { pkgs = pkgs "x86_64-linux"; modules = [ myModules proxmoxModule - ./shadowshocks + ./shadowsocks agenix.nixosModules.default ]; # specialArgs = { }; diff --git a/hosts/deployments.nix b/hosts/deployments.nix index 65e792c..5affee5 100644 --- a/hosts/deployments.nix +++ b/hosts/deployments.nix @@ -116,12 +116,12 @@ in ]; }; - shadowshocks.deployment = { - targetHost = hosts.shadowshocks; + shadowsocks.deployment = { + targetHost = hosts.shadowsocks; tags = [ "lxc" "bacco" - "shadowshocks" + "shadowsocks" ]; }; diff --git a/hosts/parameters.nix b/hosts/parameters.nix index fb78900..9c28db9 100644 --- a/hosts/parameters.nix +++ b/hosts/parameters.nix @@ -14,7 +14,7 @@ pve02 = "node.internal"; dns01 = "192.168.1.2"; dns02 = "192.168.1.3"; - shadowshocks = "shadowshocks.internal"; + shadowsocks = "shadowsocks.internal"; mpd = "192.168.1.7"; librechat = "librechat.internal"; }; diff --git a/hosts/shadowshocks/default.nix b/hosts/shadowsocks/default.nix similarity index 72% rename from hosts/shadowshocks/default.nix rename to hosts/shadowsocks/default.nix index 8a7aedc..0d95594 100644 --- a/hosts/shadowshocks/default.nix +++ b/hosts/shadowsocks/default.nix @@ -5,13 +5,13 @@ ... }: let - shadowshocks-port = 8388; + shadowsocks-port = 8388; p = import ../parameters.nix; in { age.secrets = { - shadowshocks-password.file = ../../secrets/shadowshocks-password.age; + shadowsocks-password.file = ../../secrets/shadowsocks-password.age; tailscale-authKey.file = ../../secrets/tailscale-authKey.age; }; @@ -19,10 +19,10 @@ in networking = { - shadowshocks = { + shadowsocks = { enable = true; - port = shadowshocks-port; - passwordFile = config.age.secrets.shadowshocks-password.path; + port = shadowsocks-port; + passwordFile = config.age.secrets.shadowsocks-password.path; }; tailscale = { diff --git a/secrets.nix b/secrets.nix index 7764776..32e3302 100644 --- a/secrets.nix +++ b/secrets.nix @@ -26,7 +26,7 @@ let dns01-admin-password = [ machines.dns01 ]; dns02-admin-password = [ machines.dns02 ]; dns02-dhcp-failover = [ machines.dns02 ]; - shadowshocks-password = [ machines.shadowshocks ]; + shadowsocks-password = [ machines.shadowsocks ]; }; in builtins.listToAttrs ( diff --git a/ssh-keys.nix b/ssh-keys.nix index 852f16c..3f8c446 100644 --- a/ssh-keys.nix +++ b/ssh-keys.nix @@ -19,7 +19,7 @@ rec { auth = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFsSQbXHRt+MpUh+YQxd5p6YPnbbWR/4ylz/pXjdZ9Bs"; dns01 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII7BdiP/dCE6FHoJylcBKQ5AXz06UpLHNyeuvfLVccSi"; dns02 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ+HIq6/ebjiv71xDozdOTn5AdnXgr1fGqIzXnH7Not+"; - shadowshocks = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINQ4qYaS5ccciH7BNyrF5+J3d4JtHJNr1R256/ulEtxl"; + shadowsocks = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINQ4qYaS5ccciH7BNyrF5+J3d4JtHJNr1R256/ulEtxl"; }; # Machines able to provision other machines