Compare commits

...

3 commits

Author SHA1 Message Date
6723c0e0b6
chore(secrets): rekey agenix secrets for new configuration
- Add rekeyed borgbackup passphrase for fuchsia offsite backups
- Remove unused projectsend secret from viridian
2025-10-07 22:37:26 +08:00
85dc419349
refactor(ssh): decentralize SSH configuration to per-host services
Restructures SSH trust relationships from global to host-specific configuration
for better locality of concern and principle of least privilege.

Changes:
- Collapse nixos/common/global/ssh/ back to ssh.nix (single-file module)
- Move internal host trust (fuchsia/viridian) to per-host services/ssh/
- Split BorgBase known hosts by repository (li9kg944 for fuchsia, r7ag7x1w for viridian)
- Add viridian SSH server config to accept backup connections from fuchsia
- Add fuchsia borgbackup passphrase for offsite backups
- Configure viridian to create /srv/borg-repo/fuchsia for remote backups

This enables the 3-2-1 backup strategy with fuchsia backing up to both viridian
(onsite) and BorgBase (offsite) with proper SSH authentication.
2025-10-07 22:33:20 +08:00
acab920858
WIP: SSH configuration restructure
Backup of SSH reorganization changes for future reference.
2025-10-07 20:58:09 +08:00
14 changed files with 62 additions and 31 deletions

View file

@ -1,11 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 KTkZog Up5AjKprErUc0nI98az6EFmtxev7vdg+PmNzQgizHTc
NJ+/pzyDbSgmm+0jx4C2X4ISoJDD004HlN1Ul3vrmzM
-> RGCv~-grease
Ov7OyKCQF8tm4G+cXFlibXFROTAHhssk1JaozlPpUmnFOX5ao78jVORa27WHEF/H
XxEDY0JQU6oL2fM
--- hV6JhDfXuYLaf/iGqjN6Q/N6tnDR6J1V627DDLnaGZI
°ó5<EFBFBD>Œcŧ»µ²îìu=€
iFdϲß[<D™ì0|#Ú!rHU™ŸúDª´kH'çHJØÞ@5AsK[@ zÚpm P]@¤ŸŸÓâj¡Îï/)AódÉ.¤×¡M;{h6zÄ÷É)¢×4+/aûwÀøF«apü[X<δ
ŒT
?HÞoo

View file

@ -1,12 +1,17 @@
{...}: {
# Global SSH server configuration baseline
# Host-specific trust relationships are configured in each host's services/ssh/
services.openssh = {
enable = true;
settings = {
PermitRootLogin = "no";
PasswordAuthentication = false;
LogLevel = "VERBOSE";
PermitRootLogin = "no"; # Disable root login for security
PasswordAuthentication = false; # Require key-based authentication
LogLevel = "VERBOSE"; # Enhanced logging for security auditing
};
ports = [22];
openFirewall = true;
ports = [22]; # Standard SSH port
openFirewall = true; # Allow SSH through firewall
};
}

View file

@ -78,9 +78,4 @@
monthly = 12; # Keep 12 monthly backups (1 year)
};
};
# SSH host keys for borgbase.com
programs.ssh.knownHostsFiles = [
./borgbase_hosts
];
}

View file

@ -76,9 +76,4 @@ in {
monthly = 12;
};
};
# SSH host keys for viridian
programs.ssh.knownHostsFiles = [
./viridian_hosts
];
}

Binary file not shown.

View file

@ -7,6 +7,7 @@
./pipewire
./printing
./snapper
./ssh
./udev
./xserver
];

View file

@ -0,0 +1,3 @@
li9kg944.repo.borgbase.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMS3185JdDy7ffnr0nLWqVy8FaAQeVh1QYUSiNpW5ESq
li9kg944.repo.borgbase.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwHsO5g7kAEpqcK4bpHCUKYV1cKCUNwVEVsDQyfj7N8L92E21n+aEhIX2Nh/kFs1W9D/pgsWQBAbco9e/ORuagHrO8hUQtbda5Z31PAo4eipwP17VQr5rF3seaJJNFV72v89PGwMOWQwvoJte+yngC6PYGKJ+w63SRtflihAmf4xa5Tci/f6jbX6t32m2F3bnephVzQO6anGXvGPR8QYQXzSu/27+LaKnLd2Kugb1Ytbo0+6kioa60HWejIZ/mCrCHXYpi0jAllaYEuAsTqFWf/OFUHrKWwRAJD0TV43O1++vLlxY85oQxIgc4oUbm93dXmDBssrTnqqq2jqonteUr
li9kg944.repo.borgbase.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOstKfBbwVOYQh3J7X4nzd6/VYgLfaucP9z5n4cpSzcZAOKGh6jH8e1mhQ4YupthlsdPKyFFZ3pKo4mTaRRuiJo=

View file

@ -0,0 +1,18 @@
{inputs, ...}: {
# Trust viridian's host keys for SSH connections
programs.ssh.knownHosts = {
"viridian-ed25519" = {
hostNames = ["viridian"];
publicKeyFile = "${inputs.self}/nixos/viridian/ssh_host_ed25519_key.pub";
};
"viridian-rsa" = {
hostNames = ["viridian"];
publicKeyFile = "${inputs.self}/nixos/viridian/ssh_host_rsa_key.pub";
};
};
# Trust BorgBase repository (offsite backup target)
programs.ssh.knownHostsFiles = [
./borgbase_hosts
];
}

View file

@ -81,9 +81,4 @@
monthly = 12; # Keep 12 monthly backups (1 year)
};
};
# SSH host keys for borgbase.com
programs.ssh.knownHostsFiles = [
./borgbase_hosts
];
}

View file

@ -10,6 +10,7 @@
./murmur
./opengist
./snapper
./ssh
./traefik
];
}

View file

@ -0,0 +1,29 @@
{inputs, ...}: let
# Fuchsia's host key for backup authentication
fuchsiaHostKey = builtins.readFile (
"${inputs.self}/nixos/fuchsia/ssh_host_ed25519_key.pub"
);
in {
# Trust fuchsia's host keys for SSH connections
programs.ssh.knownHosts = {
"fuchsia-ed25519" = {
hostNames = ["fuchsia"];
publicKeyFile = "${inputs.self}/nixos/fuchsia/ssh_host_ed25519_key.pub";
};
"fuchsia-rsa" = {
hostNames = ["fuchsia"];
publicKeyFile = "${inputs.self}/nixos/fuchsia/ssh_host_rsa_key.pub";
};
};
# Trust BorgBase repository (offsite backup target)
programs.ssh.knownHostsFiles = [
./borgbase_hosts
];
# Accept remote backups from fuchsia using host key authentication
users.users.root.openssh.authorizedKeys.keys = [
# Restrict fuchsia to only run borg serve in /srv/borg-repo
''command="borg serve --restrict-to-path /srv/borg-repo",restrict ${fuchsiaHostKey}''
];
}