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

buildbot: s/lib\.shell/shell/g

Browse Source
This commit is contained in:
tv 2016-02-15 18:46:19 +01:00
parent 372f2d77f3
commit ea910d7d99
3 changed files with 7 additions and 6 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";
};
serviceConfig = let
workdir="${lib.shell.escape cfg.workDir}";
secretsdir="${lib.shell.escape (toString <secrets>)}";
workdir = shell.escape cfg.workDir;
secretsdir = shell.escape (toString <secrets>);
in {
PermissionsStartOnly = true;
Type = "forking";

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

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

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

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