Upgrade to nixos 20.09

This commit is contained in:
Fabian Hauser 2020-11-28 20:46:40 +00:00
parent 024105c44c
commit 120cec699d
3 changed files with 22 additions and 9 deletions

View file

@ -46,18 +46,33 @@
};
};
virtual-networks = {
virtual = {
mgmt = {
# TODO: Introduce virtual network type
v4 = {
id = "10.249.0.0";
bitmask = 23;
};
server = { hostname = "montalin"; };
hosts = {
montalin.v4.ip = "10.249.0.1";
calanda.v4.ip = "10.249.0.2";
cavistrau.v4.ip = "10.249.0.3";
stompert.v4.ip = "10.249.0.4";
montalin = {
v4.ip = "10.249.0.1";
endpoint = "calanda.plessur.net.qo.is:12913";
publicKey = "76nV1jgexHJ898hTLbMRz1BjguFp6YCHpoV52GuNDzc=";
presharedKeyFile = "/secrets/wireguard/preshared/mgmt-montalin";
persistentKeepalive = null;
};
#calanda.v4.ip = "10.249.0.2";
#cavistrau.v4.ip = "10.249.0.3";
#stompert.v4.ip = "10.249.0.4";
hummelberg = {
v4.ip = "10.249.0.5";
endpoint = null;
publicKey = "dvv3ad9mWU9opTa8R9yPN4l1xfwdcMH0e/Rrv0GXPS4=";
presharedKeyFile = "/secrets/wireguard/preshared/mgmt-hummelberg";
persistentKeepalive = 25; # Might be behind NAT
};
};
};

View file

@ -61,9 +61,8 @@ in {
user.openssh.authorizedKeys.keys
else
[ ]) config.users.users);
hostRSAKey = /boot/dropbear_rsa_host_key;
hostECDSAKey = /boot/dropbear_ecdsa_host_key;
# Key generation with dropbearkey -t <type> -f <output-keyfile>
# Generate hostkey with ssh-keygen -t ed25519 -N "" -f /secrets/initrd_ssh_key_ed25519
hostKeys = [ "/secrets/initrd_ssh_key_ed25519" ];
};
postCommands = ''
echo 'cryptsetup-askpass' >> /root/.profile

View file

@ -6,7 +6,6 @@
enable = true;
https = true;
webfinger = true;
nginx.enable = true;
maxUploadSize = "1G";
config = {