diff --git a/base.nix b/base.nix index 7eaee32..be5a47c 100644 --- a/base.nix +++ b/base.nix @@ -95,7 +95,7 @@ with lib; ''; bashrc.text = "export PATH=/run/current-system/sw/bin"; profile.text = "export PATH=/run/current-system/sw/bin"; - "resolv.conf".text = "nameserver 10.0.2.3"; + "resolv.conf".text = "nameserver 192.168.1.1"; passwd.text = '' root:x:0:0:System administrator:/root:/run/current-system/sw/bin/bash sshd:x:498:65534:SSH privilege separation user:/var/empty:/run/current-system/sw/bin/nologin diff --git a/configuration.nix b/configuration.nix index 010c487..37f6aaa 100644 --- a/configuration.nix +++ b/configuration.nix @@ -7,8 +7,10 @@ environment.etc = { "ssh/authorized_keys.d/root" = { text = '' - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34wZQFEOGkA5b0Z6maE3aKy/ix1MiK1D0Qmg4E9skAA57yKtWYzjA23r5OCF4Nhlj1CuYd6P1sEI/fMnxf+KkqqgW3ZoZ0+pQu4Bd8Ymi3OkkQX9kiq2coD3AFI6JytC6uBi6FaZQT5fG59DbXhxO5YpZlym8ps1obyCBX0hyKntD18RgHNaNM+jkQOhQ5OoxKsBEobxQOEdjIowl2QeEHb99n45sFr53NFqk3UCz0Y7ZMf1hSFQPuuEC/wExzBBJ1Wl7E1LlNA4p9O3qJUSadGZS4e5nSLqMnbQWv2icQS/7J8IwY0M8r1MsL8mdnlXHUofPlG1r4mtovQ2myzOx clever@nixos - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKITUnIETct0d1Ky7iEofM8BV/U9ViuAd72abm26ibhkVKYuLlIvNBtf7+fsyaHR3cc4kmiUz26co4LV2q10HLO7nua7Ry0QhtPvPnpudandB4LbV4ieW1cqcWcPpsM1GssUZhZthbkwLf7h2exojqVj8vqPm5RaBl1eULXaPTldCiSe5ZxNuVbm3qT8Lfc2E3ifKT6A7WqZN00f1+YSnaA9uy0VgVDReDqyujAZaKGUwSa2G8eqzN3guN7VcBZek2p1v1n0EwpFdBxzT3Ncqh5wIYPNn084q5lU13TAjw+tTO7Q059e4HFLaR24w8NT60BrO1dbGYLbjWNri1G3pz root@router + ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCMALVC8RDTHec+PC8y1s3tcpUAODgq6DEzQdHDf/cyvDMfmCaPiMxfIdmkns5lMa03hymIfSmLUF0jFFDc7biRp7uf9AAXNsrTmplHii0l0McuOOZGlSdZM4eL817P7UwJqFMxJyFXDjkubhQiX6kp25Kfuj/zLnupRCaiDvE7ho/xay6Jrv0XLz935TPDwkc7W1asLIvsZLheB+sRz9SMOb9gtrvk5WXZl5JTOFOLu+JaRwQLHL/xdcHJTOod7tqHYfpoC5JHrEwKzbhTOwxZBQBfTQjQktKENQtBxXHTe71rUEWfEZQGg60/BC4BrRmh4qJjlJu3v4VIhC7SSHn1 root + ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBNdIiLvP2hmDUFyyE0oLOIXrjrMdWWpBV9/gPR5m4AiARx4JkufIDZzmptdYQ5FhJORJ4lluPqp7dAmahoSwg4lv9Di0iNQpHMJvNGZLHYKM1H1FWCCFIEDJ8bD4SVfrDg== root + ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBF/YybP+fQ0J+bNqM5Vgx5vDmVqVWsgUdF1moUxghv7d73GZAFaM6IFBdrXTAa33AwnWwDPMrTgP1V6SXBkb3ciJo/lD1urJGbydbSI5Ksq9d59wvOeANvyWYrQw6+eqTQ== sb + ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBFkmOCQ3BQh3qUjLtfdqyeBsx8rkk/QYlzB0TMrnfn6waLN6yKfPC3WVFv4zN5kNKb/OayvqDa+zfkKe85e/oIPQQKflF7GrCHdssz33DCnW90cz532E6iqG1pjeZjID2A== flo ''; mode = "0444"; }; diff --git a/runit.nix b/runit.nix index d7b0bf3..67cff43 100644 --- a/runit.nix +++ b/runit.nix @@ -7,8 +7,8 @@ let Port 22 PidFile /run/sshd.pid Protocol 2 - PermitRootLogin yes - PasswordAuthentication yes + PermitRootLogin prohibit-password + PasswordAuthentication no AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u ''; compat = pkgs.runCommand "runit-compat" {} '' @@ -31,10 +31,10 @@ in "runit/1".source = pkgs.writeScript "1" '' #!${pkgs.runtimeShell} ${lib.optionalString config.not-os.simpleStaticIp '' - ip addr add 10.0.2.15 dev eth0 + ip addr add 103.206.98.205 dev eth0 ip link set eth0 up - ip route add 10.0.2.0/24 dev eth0 - ip route add default via 10.0.2.2 dev eth0 + ip route add 103.206.98.200/29 dev eth0 + ip route add default via 103.206.98.200 dev eth0 ''} mkdir /bin/ ln -s ${pkgs.runtimeShell} /bin/sh