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

s 1 wolf: use config.krebs.lib

Browse Source
This commit is contained in:
makefu 2016-02-15 17:43:30 +01:00
parent 3ceff0ec29
commit a94a4c4206
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
krebs/3modules/buildbot/master.nix
View File

@ -338,8 +338,8 @@ let
SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
}; };
serviceConfig = let serviceConfig = let
workdir="${lib.shell.escape cfg.workDir}"; workdir="${shell.escape cfg.workDir}";
secretsdir="${lib.shell.escape (toString <secrets>)}"; secretsdir="${shell.escape (toString <secrets>)}";
in { in {
PermissionsStartOnly = true; PermissionsStartOnly = true;
Type = "forking"; Type = "forking";

6
krebs/3modules/buildbot/slave.nix
View File

@ -149,9 +149,9 @@ let
} // cfg.extraEnviron; } // cfg.extraEnviron;
serviceConfig = let serviceConfig = let
workdir = "${lib.shell.escape cfg.workDir}"; workdir = "${shell.escape cfg.workDir}";
contact = "${lib.shell.escape cfg.contact}"; contact = "${shell.escape cfg.contact}";
description = "${lib.shell.escape cfg.description}"; description = "${shell.escape cfg.description}";
buildbot = pkgs.buildbot-slave; buildbot = pkgs.buildbot-slave;
# TODO:make this # TODO:make this
in { in {

5
krebs/3modules/repo-sync.nix
View File

@ -1,7 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
let let
cfg = config.krebs.repo-sync; cfg = config.krebs.repo-sync;
@ -71,7 +70,7 @@ let
imp = { imp = {
users.users.repo-sync = { users.users.repo-sync = {
name = "repo-sync"; name = "repo-sync";
uid = genid "repo-sync"; uid = config.krebs.lib.genid "repo-sync";
description = "repo-sync user"; description = "repo-sync user";
home = cfg.stateDir; home = cfg.stateDir;
createHome = true; createHome = true;
@ -98,7 +97,7 @@ let
PermissionsStartOnly = true; PermissionsStartOnly = true;
ExecStartPre = pkgs.writeScript "prepare-repo-sync-user" '' ExecStartPre = pkgs.writeScript "prepare-repo-sync-user" ''
#! /bin/sh #! /bin/sh
cp -v ${lib.shell.escape cfg.privateKeyFile} ${cfg.stateDir}/ssh.priv cp -v ${config.krebs.lib.shell.escape cfg.privateKeyFile} ${cfg.stateDir}/ssh.priv
chown repo-sync ${cfg.stateDir}/ssh.priv chown repo-sync ${cfg.stateDir}/ssh.priv
''; '';
ExecStart = "${pkgs.repo-sync}/bin/repo-sync ${repo-sync-config}"; ExecStart = "${pkgs.repo-sync}/bin/repo-sync ${repo-sync-config}";

4
shared/2configs/shack-drivedroid.nix
View File

@ -1,7 +1,8 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, ... }:
let let
repodir = "/var/srv/drivedroid"; repodir = "/var/srv/drivedroid";
srepodir = lib.shell.escape repodir; srepodir = config.krebs.lib.shell.escape repodir;
in in
{ {
environment.systemPackages = [ pkgs.drivedroid-gen-repo ]; environment.systemPackages = [ pkgs.drivedroid-gen-repo ];
@ -40,5 +41,4 @@ in
}; };
}; };
}; };
} }