ciapa
/
infrastructure
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ciapa:8d6f91ea6fb78bba6f06cb8e3c5731fe52844bf7
Branches Tags
ciapa:master
ciapa:update_flake_lock_action
ciapa:test
..
compare: ciapa:6e7dd508d0eadaad943a94c1861da0413e661690
Branches Tags
ciapa:master
ciapa:update_flake_lock_action
ciapa:test

No commits in common. "8d6f91ea6fb78bba6f06cb8e3c5731fe52844bf7" and "6e7dd508d0eadaad943a94c1861da0413e661690" have entirely different histories.
8d6f91ea6f ... 6e7dd508d0

2 changed files with 14 additions and 25 deletions
Show Stats Expand all files Collapse all files

36
hosts/phoenix.lewd.wtf/services/zfs.nix
View File

@ -6,21 +6,23 @@ let
in in
{ {
# ZFS remote unlocking # ZFS remote unlocking
boot.initrd.systemd.enable = true;
boot.initrd.availableKernelModules = [ "igb" ]; boot.initrd.availableKernelModules = [ "igb" ];
boot.kernelParams = [ boot.kernelParams = [
"ip=192.168.0.42::192.168.0.1:255.255.252.0:phoenix-initrd:eno2:off:192.168.0.1" "ip=192.168.0.42::192.168.0.1:255.255.252.0:phoenix-initrd:eno2:off:192.168.0.1"
]; ];
boot.initrd.systemd.services.zfsunlock = { boot.initrd.network = {
description = "Unlock ZFS pools"; enable = true;
wantedBy = [ ssh = {
"initrd.target" enable = true;
]; port = 2222;
before = [ hostKeys = [
"zfs-import-zroot.service" /boot-1/initrd-ssh-key
]; /boot-2/initrd-ssh-key
unitConfig.DefaultDependencies = "no"; ];
serviceConfig.Type = "oneshot"; authorizedKeys = config.users.users.root.openssh.authorizedKeys.keys;
script = '' };
postCommands = ''
cat <<EOF > /root/.profile cat <<EOF > /root/.profile
if pgrep -x "zfs" > /dev/null if pgrep -x "zfs" > /dev/null
then then
@ -36,18 +38,6 @@ in
EOF EOF
''; '';
}; };
boot.initrd.network = {
enable = true;
ssh = {
enable = true;
port = 2222;
hostKeys = [
/boot-1/initrd-ssh-key
/boot-2/initrd-ssh-key
];
authorizedKeys = config.users.users.root.openssh.authorizedKeys.keys;
};
};
# ZFS options from https://nixos.wiki/wiki/NixOS_on_ZFS # ZFS options from https://nixos.wiki/wiki/NixOS_on_ZFS
networking.hostId = "42069420"; networking.hostId = "42069420";

3
modules/base/packages.nix
View File

@ -4,8 +4,7 @@
vim vim
git git
curl curl
btop htop
rclone rclone
screen
]; ];
} }