Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tv x0vncserver: use LoadCredential

Browse Source
This commit is contained in:
tv 2021-12-25 11:41:06 +01:00
parent 969bd9767e
commit 8ee6e71092
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tv/3modules/x0vncserver.nix
View File

@ -11,17 +11,12 @@ in {
}; };
enable = mkEnableOption "tv.x0vncserver"; enable = mkEnableOption "tv.x0vncserver";
pwfile = mkOption { pwfile = mkOption {
default = { default = toString <secrets> + "/vncpasswd";
name = "x0vncserver-pwfile";
owner = cfg.user;
path = "${cfg.user.home}/.vncpasswd";
source-path = toString <secrets> + "/vncpasswd";
};
description = '' description = ''
Use vncpasswd to edit pwfile. Use vncpasswd to edit pwfile.
See: nix-shell -p tigervnc --run 'man vncpasswd' See: nix-shell -p tigervnc --run 'man vncpasswd'
''; '';
type = types.secret-file; type = types.absolute-pathname;
}; };
rfbport = mkOption { rfbport = mkOption {
default = 5900; default = 5900;
@ -33,26 +28,17 @@ in {
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
krebs.secret.files = { krebs.systemd.services.x0vncserver = {};
x0vncserver-pwfile = cfg.pwfile;
};
systemd.services.x0vncserver = { systemd.services.x0vncserver = {
after = [ after = [ "graphical.target" ];
config.krebs.secret.files.x0vncserver-pwfile.service requires = [ "graphical.target" ];
"graphical.target"
];
partOf = [
config.krebs.secret.files.x0vncserver-pwfile.service
];
requires = [
"graphical.target"
];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.tigervnc}/bin/x0vncserver ${toString [ ExecStart = "${pkgs.tigervnc}/bin/x0vncserver ${toString [
"-display ${cfg.display}" "-display ${cfg.display}"
"-passwordfile ${cfg.pwfile.path}" "-passwordfile \${CREDENTIALS_DIRECTORY}/pwfile"
"-rfbport ${toString cfg.rfbport}" "-rfbport ${toString cfg.rfbport}"
]}"; ]}";
LoadCredential = "ssh_key:${cfg.pwfile}";
User = cfg.user.name; User = cfg.user.name;
}; };
}; };