diff options
| author | lassulus <lassulus@lassul.us> | 2017-07-14 14:09:45 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-07-14 14:09:45 +0200 |
| commit | 3698f2a40c2db7df0888974c9b2e347947088a98 (patch) | |
| tree | 64c7d8ecddb6acf503b5335a4058fd2018734559 /tv/source.nix | |
| parent | 11db8fb3294a3d0cdef9160834f855d9c648ef01 (diff) | |
| parent | c113f235ccfe62c992bf28692b999020c92ef275 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/source.nix')
| -rw-r--r-- | tv/source.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tv/source.nix b/tv/source.nix index dcfdb7552..18733ee5c 100644 --- a/tv/source.nix +++ b/tv/source.nix @@ -17,10 +17,12 @@ in buildbot = toString <stockholm/tv/dummy_secrets>; tv = "/home/tv/secrets/${name}"; }; - secrets-common.file = "/home/tv/secrets/common"; stockholm.file = toString <stockholm>; } - (mkIf secure { + (mkIf (builder == "tv") { + secrets-common.file = "/home/tv/secrets/common"; + }) + (mkIf (builder == "tv" && secure) { secrets-master.file = "/home/tv/secrets/master"; }) override |