diff --git a/newinfra/nix/hive.nix b/newinfra/nix/hive.nix index ed1d252..90a05a9 100644 --- a/newinfra/nix/hive.nix +++ b/newinfra/nix/hive.nix @@ -15,7 +15,6 @@ slides = fetchTarball "https://github.com/Noratrieb/slides/archive/0401f35c22b124b69447655f0c537badae9e223c.tar.gz"; pretense = import (fetchTarball "https://github.com/Noratrieb/pretense/archive/270b01fc1118dfd713c1c41530d1a7d98f04527d.tar.gz"); - fakessh = import (fetchTarball "https://github.com/Noratrieb/fakessh/archive/7a129eba2e0bd15d46efce2f2e0daebeb6888bec.tar.gz"); networkingConfig = { dns1 = { @@ -243,37 +242,44 @@ ''; }; # VPS5 is the primary test server, where new things are being deployed that could break stuff maybe. - vps5 = { name, nodes, modulesPath, config, pkgs, lib, fakessh, ... }: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ./modules/contabo - ./modules/ingress - ./modules/wg-mesh - ./modules/garage - ]; + vps5 = { name, nodes, modulesPath, config, pkgs, lib, ... }: + let + commit = "18993f3a00c71af419cb28c01d200bd2efd85603"; + fakessh = import (fetchTarball "https://github.com/Noratrieb/fakessh/archive/${commit}.tar.gz"); + in + { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ./modules/contabo + ./modules/ingress + ./modules/wg-mesh + ./modules/garage + ]; - # services.openssh.ports = [ 2000 ]; - #systemd.services.fakessh = { - # description = "fakessh ssh honeypot"; - # wantedBy = [ "multi-user.target" ]; - # after = [ "network.target" ]; - # serviceConfig = { - # DynamicUser = true; - # ExecStart = "${lib.getExe (fakessh {inherit pkgs;})}"; - # AmbientCapabilities = "CAP_NET_BIND_SERVICE"; - # # i really don't trust this. - # MemoryHigh = "100;"; - # MemoryMax = "200M"; - # Environment = [ - # "FAKESSH_LISTEN_ADDR=0.0.0.0:22" - # "RUST_LOG=debug" - # ]; - # }; - #}; - # networking.firewall.allowedTCPPorts = [ 22 ]; - #deployment.targetPort = 2000; - deployment.tags = [ "eu" "apps" ]; - system.stateVersion = "23.11"; - }; + #services.openssh.ports = [ 2000 ]; + #systemd.services.fakessh = { + # description = "fakessh ssh honeypot"; + # wantedBy = [ "multi-user.target" ]; + # after = [ "network.target" ]; + # serviceConfig = { + # DynamicUser = true; + # ExecStart = "${lib.getExe (fakessh {inherit pkgs;})}"; + # AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + # # i really don't trust this. + # MemoryHigh = "100;"; + # MemoryMax = "200M"; + # Environment = [ + # "FAKESSH_LISTEN_ADDR=0.0.0.0:22" + # "RUST_LOG=debug" + # #"FAKESSH_JSON_LOGS=1" + # ]; + # }; + #}; + #networking.firewall.allowedTCPPorts = [ 22 ]; + #deployment.targetPort = 2000; + + deployment.tags = [ "eu" "apps" ]; + system.stateVersion = "23.11"; + }; } diff --git a/newinfra/nix/modules/dns/noratrieb.dev.nix b/newinfra/nix/modules/dns/noratrieb.dev.nix index 397f2d2..e4aadac 100644 --- a/newinfra/nix/modules/dns/noratrieb.dev.nix +++ b/newinfra/nix/modules/dns/noratrieb.dev.nix @@ -58,6 +58,7 @@ let pronouns.TXT = [ "she/her" ]; + sshhoneypot = vps5; # --- infra grafana = vps3;