Huge Typo!!!
This commit is contained in:
parent
830670c8f0
commit
abbad538be
6 changed files with 13 additions and 13 deletions
|
|
@ -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 = { };
|
||||
|
|
|
|||
|
|
@ -116,12 +116,12 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
shadowshocks.deployment = {
|
||||
targetHost = hosts.shadowshocks;
|
||||
shadowsocks.deployment = {
|
||||
targetHost = hosts.shadowsocks;
|
||||
tags = [
|
||||
"lxc"
|
||||
"bacco"
|
||||
"shadowshocks"
|
||||
"shadowsocks"
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
@ -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 (
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue