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

krebs.github-host-sync.ssh-identity-file: fix type

Browse Source
This commit is contained in:
tv 2015-10-09 14:08:06 +02:00
parent f15864623a
commit 51e4b62de2
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
krebs/3modules/github-hosts-sync.nix
View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with builtins; with builtins;
with lib; with import ../4lib { inherit lib; };
let let
cfg = config.krebs.github-hosts-sync; cfg = config.krebs.github-hosts-sync;
@ -21,7 +21,7 @@ let
default = "/var/lib/github-hosts-sync"; default = "/var/lib/github-hosts-sync";
}; };
ssh-identity-file = mkOption { ssh-identity-file = mkOption {
type = types.str; # TODO must be named *.ssh.{id_rsa,id_ed25519} type = types.suffixed-str [".ssh.id_ed25519" ".ssh.id_rsa"];
default = toString <secrets/github-hosts-sync.ssh.id_rsa>; default = toString <secrets/github-hosts-sync.ssh.id_rsa>;
}; };
}; };
@ -42,16 +42,6 @@ let
#! /bin/sh #! /bin/sh
set -euf set -euf
ssh_identity_file_target=$(
case ${cfg.ssh-identity-file} in
*.ssh.id_rsa|*.ssh.id_ed25519) echo ${cfg.dataDir}/.ssh/id_rsa;;
*.ssh.id_ed25519) echo ${cfg.dataDir}/.ssh/id_ed25519;;
*)
echo "bad identity file name: ${cfg.ssh-identity-file}" >&2
exit 1
esac
)
mkdir -p ${cfg.dataDir} mkdir -p ${cfg.dataDir}
chown ${user.name}: ${cfg.dataDir} chown ${user.name}: ${cfg.dataDir}
@ -59,7 +49,7 @@ let
-o ${user.name} \ -o ${user.name} \
-m 0400 \ -m 0400 \
${cfg.ssh-identity-file} \ ${cfg.ssh-identity-file} \
"$ssh_identity_file_target" ${cfg.dataDir}/.ssh/${fileExtension cfg.ssh-identity-file}
''; '';
ExecStart = "${pkgs.github-hosts-sync}/bin/github-hosts-sync"; ExecStart = "${pkgs.github-hosts-sync}/bin/github-hosts-sync";
}; };
@ -75,5 +65,8 @@ let
name = "github-hosts-sync"; name = "github-hosts-sync";
uid = 3220554646; # genid github-hosts-sync uid = 3220554646; # genid github-hosts-sync
}; };
in
out # TODO move to lib?
fileExtension = s: last (splitString "." s);
in out