diff --git a/hosts/xlab-gateway/default.nix b/hosts/xlab-gateway/default.nix index 7bd28a8..e34fde1 100644 --- a/hosts/xlab-gateway/default.nix +++ b/hosts/xlab-gateway/default.nix @@ -1,5 +1,5 @@ -# xlab-gateway - Lab Gateway / Router -# Current services: Kea DHCP4/DDNS, radvd, WireGuard, NAT, policy routing +# xlab-gateway - Lab Gateway / Router (NixOS) +# Services: Kea DHCP4/6, DDNS, radvd, WireGuard, NAT, policy routing { config, pkgs, lib, ... }: { @@ -77,12 +77,10 @@ systemd.network.wait-online.enable = false; users.users.ldx = { - extraGroups = [ "networkmanager" ]; hashedPassword = "$y$j9T$R0XBoDSGk700h7UdglfaJ1$mjRwpJir/Tno1.fCbjet0cp/JPb1DW.JILvmE5.NJuD"; }; - + users.users."ye-lw21" = { - extraGroups = [ "networkmanager" ]; hashedPassword = "$y$j9T$jiLKGLB/gJKEYYn2zaoUw/$9mfwEUo5z2sH9OXwioLnbAVpCMOg2lUpA3ph9Vqx228"; }; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 516cbd7..084fc04 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -10,11 +10,9 @@ xlab-gateway = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII+EKDpUPWahclzYF6o26AWfrRyZ3bW7D3l9oMo2J6Eg"; in { - "skydick-wg.age".publicKeys = admins ++ [ skydick ]; "xlab-wg-skyworks.age".publicKeys = admins ++ [ xlab-gateway ]; "xlab-wg-wgnet.age".publicKeys = admins ++ [ xlab-gateway ]; "xlab-wg-wgnet-psk.age".publicKeys = admins ++ [ xlab-gateway ]; - "xlab-wg-warp.age".publicKeys = admins ++ [ xlab-gateway ]; "xlab-ddns-tsig.age".publicKeys = admins ++ [ xlab-gateway ]; "influxdb-token.age".publicKeys = admins ++ [ skydick ]; "skydick-ldap-bind.age".publicKeys = admins ++ [ skydick ]; diff --git a/secrets/skydick-wg.age b/secrets/skydick-wg.age deleted file mode 100644 index 77dede1..0000000 --- a/secrets/skydick-wg.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 p6tzjw y3PXQDtehp12saMdu0W9/2N9bKYZpEu1K6ExO4kMUlk -h9YZB7yo7dwE+BAuTK5ixQ3gcsHLekCbmHaKGh0Mbq8 --> ssh-ed25519 UHvpBA E8RFpnNwBiTrTCK+y3XMGvdyA7INv0iqo5KuDzJGXFI -EYJTZx/0+45O6usKI3fDOAUn2o1uHxL3EZfFR+GkNwA --> ssh-ed25519 HM29mw Y7iMPifs1GVXirzkUkzoJ/p4HdGS7eKYlgyJjvMAY2g -hp8Q9HmcUanBw4/oPGml2UIprh4oZHrqdxICaVMV0mk ---- in5145EL4J0hTa6DSkfmPZDZVPW93Erd8N9D0K3X32U -` -�Hb�)hZ��j�v�X���sO�*J��p�~}�"��/� \ No newline at end of file diff --git a/secrets/xlab-wg-warp.age b/secrets/xlab-wg-warp.age deleted file mode 100644 index e72f7f2..0000000 --- a/secrets/xlab-wg-warp.age +++ /dev/null Binary files differ