eeva
/
krops
mirror of https://cgit.krebsco.de/krops
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #7 from nyantec/feature/sudo 

ssh, rsync: support using sudo on remote
This commit is contained in:
tv 2019-11-29 13:20:21 +01:00 committed by GitHub
parent 2e94e6eb24 cd21575333
commit 8de797dae0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/default.nix
View File

@ -46,12 +46,13 @@ let {
default = defVal: val: if val != null then val else defVal; default = defVal: val: if val != null then val else defVal;
parse = lib.match "(([^@]+)@)?(([^:/]+))?(:([^/]+))?(/.*)?" s; parse = lib.match "(([^@]+)@)?(([^:/]+))?(:([^/]+))?(/.*)?" s;
elemAt' = xs: i: if lib.length xs > i then lib.elemAt xs i else null; elemAt' = xs: i: if lib.length xs > i then lib.elemAt xs i else null;
in { in if lib.isString s then {
user = default (lib.getEnv "LOGNAME") (elemAt' parse 1); user = default (lib.getEnv "LOGNAME") (elemAt' parse 1);
host = default (lib.maybeEnv "HOSTNAME" lib.getHostName) (elemAt' parse 3); host = default (lib.maybeEnv "HOSTNAME" lib.getHostName) (elemAt' parse 3);
port = default "22" /* "ssh"? */ (elemAt' parse 5); port = default "22" /* "ssh"? */ (elemAt' parse 5);
path = default "/var/src" /* no default? */ (elemAt' parse 6); path = default "/var/src" /* no default? */ (elemAt' parse 6);
}; sudo = false;
} else s;
shell = let shell = let
isSafeChar = lib.testString "[-+./0-9:=A-Z_a-z]"; isSafeChar = lib.testString "[-+./0-9:=A-Z_a-z]";

2
pkgs/krops/default.nix
View File

@ -26,7 +26,7 @@ in
"-p" target.port "-p" target.port
"-t" "-t"
target.host target.host
command (if target.sudo then command else "sudo ${command}")
]; ];
}; };

10
pkgs/populate/default.nix
View File

@ -157,6 +157,7 @@ let
fi fi
${rsync}/bin/rsync \ ${rsync}/bin/rsync \
${optionalString (config.useChecksum or false) /* sh */ "--checksum"} \ ${optionalString (config.useChecksum or false) /* sh */ "--checksum"} \
${optionalString target.sudo /* sh */ "--rsync-path=\"sudo rsync\""} \
-e ${quote (ssh' target)} \ -e ${quote (ssh' target)} \
-vFrlptD \ -vFrlptD \
--delete-excluded \ --delete-excluded \
@ -172,9 +173,12 @@ let
shell' = target: script: shell' = target: script:
if isLocalTarget target if isLocalTarget target
then script then script
else /* sh */ '' else
${ssh' target} ${quote target.host} ${quote script} if target.sudo then /* sh */ ''
''; ${ssh' target} ${quote target.host} ${quote "sudo bash -c ${quote script}"}
'' else ''
${ssh' target} ${quote target.host} ${quote script}
'';
ssh' = target: concatMapStringsSep " " quote [ ssh' = target: concatMapStringsSep " " quote [
"${openssh}/bin/ssh" "${openssh}/bin/ssh"