fix proxy jump

This commit is contained in:
2023-11-11 20:16:15 +01:00
parent 42e8356d2c
commit 62414b5ce5
4 changed files with 148 additions and 5 deletions
+36
View File
@@ -0,0 +1,36 @@
{ pkgs, config, ... }:
{
sops.age.generateKey = true;
sops.age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
sops.defaultSopsFile = ../../../../secrets/user-pbsds.yaml;
sops.secrets."age/pvv-infra".path = "%r/sops/age/pvv-infra.txt";
home.sessionVariables = {
#SOPS_AGE_KEY_FILE = config.sops.age.keyFile;
SOPS_AGE_KEY_FILE = "$XDG_RUNTIME_DIR/sops/age/keys.txt";
};
systemd.user.services.combine-keys = {
Install.WantedBy = config.systemd.user.services.sops-nix.Install.WantedBy;
Unit.After = [ "sops-nix.service" ];
Service = {
Type = "oneshot";
ExecStart = pkgs.writeShellScript "mk-sops-age-key" ''
set -euo pipefail
test -n "$XDG_RUNTIME_DIR"
test -d "$XDG_RUNTIME_DIR"
test -f ${config.sops.age.keyFile}
install -Dm600 -t "$XDG_RUNTIME_DIR/sops/age/keys.txt" <(
cat ${config.sops.age.keyFile}
if test -s "$XDG_RUNTIME_DIR"/sops/age/pvv-infra.txt; then
cat "$XDG_RUNTIME_DIR"/pvv-infra.txt
fi
)
'';
};
};
}
+5 -5
View File
@@ -28,17 +28,17 @@
"*.pbsds.net".forwardX11Trusted = true;
"*.ntnu.no".user = "pederbs";
"*.pvv.org".user = "pederbs";
"*.hpc.ntnu.no".proxyJump = "isvegg.pvv.ntnu.no";
"*.idi.ntnu.no".proxyJump = "isvegg.pvv.ntnu.no";
"*.hpc.ntnu.no".proxyJump = "hildring.pvv.ntnu.no";
"*.idi.ntnu.no".proxyJump = "hildring.pvv.ntnu.no";
# me
"garp.pbsds.net".proxyJump = "isvegg.pvv.ntnu.no";
"bolle.pbsds.net".proxyJump = "isvegg.pvv.ntnu.no";
"garp.pbsds.net".proxyJump = "hildring.pvv.ntnu.no";
"bolle.pbsds.net".proxyJump = "hildring.pvv.ntnu.no";
"knut.pbsds.net".port = 23;
"nord.pbsds.net".port = 24;
"sopp.pbsds.net".port = 26;
"noximilien.pbsds.net" = {};
"rocm.pbsds.net".proxyJump = "isvegg.pvv.ntnu.no";
"rocm.pbsds.net".proxyJump = "hildring.pvv.ntnu.no";
# ntnu
"stud.ntnu.no".hostname = "login.stud.ntnu.no";