mirror of
https://github.com/oddlama/nix-config.git
synced 2025-10-11 07:10:39 +02:00
chore: remove initrd host key generation script, this is a simple oneliner anyways
This commit is contained in:
parent
04305e5968
commit
ece9554e76
4 changed files with 5 additions and 27 deletions
|
@ -214,7 +214,7 @@
|
||||||
PresharedKeyFile = config.rekey.secrets.${peerPresharedKeySecret nodeName clientNode}.path;
|
PresharedKeyFile = config.rekey.secrets.${peerPresharedKeySecret nodeName clientNode}.path;
|
||||||
AllowedIPs = map (net.cidr.make 128) clientCfg.addresses;
|
AllowedIPs = map (net.cidr.make 128) clientCfg.addresses;
|
||||||
}
|
}
|
||||||
// optionalAttrs clientCfg.keepalive {
|
// optionalAttrs clientCfg.client.keepalive {
|
||||||
PersistentKeepalive = 25;
|
PersistentKeepalive = 25;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
apps = [
|
apps = [
|
||||||
./draw-graph.nix
|
./draw-graph.nix
|
||||||
./format-secrets.nix
|
./format-secrets.nix
|
||||||
./generate-initrd-keys.nix
|
|
||||||
./generate-wireguard-keys.nix
|
./generate-wireguard-keys.nix
|
||||||
./show-wireguard-qr.nix
|
./show-wireguard-qr.nix
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
{
|
|
||||||
self,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit
|
|
||||||
(pkgs.lib)
|
|
||||||
escapeShellArg
|
|
||||||
concatStringsSep
|
|
||||||
mapAttrsToList
|
|
||||||
;
|
|
||||||
mapAttrsToLines = f: attrs: concatStringsSep "\n" (mapAttrsToList f attrs);
|
|
||||||
generateHostKey = node: ''
|
|
||||||
if [[ ! -f ${escapeShellArg node.config.rekey.secrets.initrd_host_ed25519_key.file} ]]; then
|
|
||||||
echo TODOOOOO
|
|
||||||
exit 1
|
|
||||||
ssh-keygen -t ed25519 -N "" -f /tmp/1
|
|
||||||
TODO
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
pkgs.writeShellScript "generate-initrd-keys" ''
|
|
||||||
set -euo pipefail
|
|
||||||
${mapAttrsToLines generateHostKey self.nodes}
|
|
||||||
''
|
|
|
@ -49,6 +49,8 @@
|
||||||
echo "$privkey" | ${pkgs.wireguard-tools}/bin/wg pubkey > ${pubkeyFile}
|
echo "$privkey" | ${pkgs.wireguard-tools}/bin/wg pubkey > ${pubkeyFile}
|
||||||
${pkgs.rage}/bin/rage -e ${rageEncryptArgs} <<< "$privkey" > ${privkeyFile} \
|
${pkgs.rage}/bin/rage -e ${rageEncryptArgs} <<< "$privkey" > ${privkeyFile} \
|
||||||
|| { echo "[1;31merror:[m Failed to encrypt wireguard private key for peer ${peerName} on network ${wgName}!" >&2; exit 1; }
|
|| { echo "[1;31merror:[m Failed to encrypt wireguard private key for peer ${peerName} on network ${wgName}!" >&2; exit 1; }
|
||||||
|
else
|
||||||
|
echo "[90mSkipping existing "${keyBasename}".{age,pub}[m"
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -65,6 +67,8 @@
|
||||||
psk=$(${pkgs.wireguard-tools}/bin/wg genpsk)
|
psk=$(${pkgs.wireguard-tools}/bin/wg genpsk)
|
||||||
${pkgs.rage}/bin/rage -e ${rageEncryptArgs} <<< "$psk" > ${pskFile} \
|
${pkgs.rage}/bin/rage -e ${rageEncryptArgs} <<< "$psk" > ${pskFile} \
|
||||||
|| { echo "[1;31merror:[m Failed to encrypt wireguard psk for peers ${peer1} and ${peer2} on network ${wgName}!" >&2; exit 1; }
|
|| { echo "[1;31merror:[m Failed to encrypt wireguard psk for peers ${peer1} and ${peer2} on network ${wgName}!" >&2; exit 1; }
|
||||||
|
else
|
||||||
|
echo "[90mSkipping existing "${pskFile}"[m"
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue