diff options
| author | lassulus <lass@aidsballs.de> | 2016-06-13 13:50:52 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-06-13 13:50:52 +0200 |
| commit | 23385c2984c9d4fbff65c920d9d59bc29314a639 (patch) | |
| tree | d7e4f635be78922359b21970f6a6c8731995e38d /krebs/3modules/repo-sync.nix | |
| parent | de43b0e6f50e4d044cc0609a3d7d7c7d869552fe (diff) | |
| parent | 2dd4dbbf6ea77972c7d5edb0ec25b8e778bfeb50 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/repo-sync.nix')
| -rw-r--r-- | krebs/3modules/repo-sync.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/krebs/3modules/repo-sync.nix b/krebs/3modules/repo-sync.nix index 7a7c80a75..c5c806cdf 100644 --- a/krebs/3modules/repo-sync.nix +++ b/krebs/3modules/repo-sync.nix @@ -1,12 +1,12 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; let cfg = config.krebs.repo-sync; out = { options.krebs.repo-sync = api; - config = mkIf cfg.enable imp; + config = lib.mkIf cfg.enable imp; }; api = { @@ -70,7 +70,7 @@ let imp = { users.users.repo-sync = { name = "repo-sync"; - uid = config.krebs.lib.genid "repo-sync"; + uid = genid "repo-sync"; description = "repo-sync user"; home = cfg.stateDir; createHome = true; @@ -95,9 +95,8 @@ let serviceConfig = { Type = "simple"; PermissionsStartOnly = true; - ExecStartPre = pkgs.writeScript "prepare-repo-sync-user" '' - #! /bin/sh - cp -v ${config.krebs.lib.shell.escape cfg.privateKeyFile} ${cfg.stateDir}/ssh.priv + ExecStartPre = pkgs.writeDash "prepare-repo-sync-user" '' + cp -v ${shell.escape cfg.privateKeyFile} ${cfg.stateDir}/ssh.priv chown repo-sync ${cfg.stateDir}/ssh.priv ''; ExecStart = "${pkgs.repo-sync}/bin/repo-sync ${repo-sync-config}"; |