summaryrefslogtreecommitdiffstats
path: root/lass/source.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-09-05 23:00:23 +0200
committertv <tv@krebsco.de>2017-09-05 23:00:23 +0200
commit1436781119f92cbf431db5e817fba765b24d922a (patch)
treef8ee298cdddd02beab384b047cc1a76bd1bd26c1 /lass/source.nix
parent77e9bd83e2208d1d732ef505e0e996a2440d5d7c (diff)
parent71d3f53f2bf767cfbb6e941438431d6083f304b9 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/source.nix')
-rw-r--r--lass/source.nix39
1 files changed, 21 insertions, 18 deletions
diff --git a/lass/source.nix b/lass/source.nix
index 26c668241..52b0d99f2 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -1,24 +1,27 @@
with import <stockholm/lib>;
-host@{ name, secure ? false }: let
+host@{ name, secure ? false, override ? {} }: let
builder = if getEnv "dummy_secrets" == "true"
then "buildbot"
else "lass";
_file = <stockholm> + "/lass/1systems/${name}/source.nix";
in
- evalSource (toString _file) {
- nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
- secrets.file = getAttr builder {
- buildbot = toString <stockholm/lass/2configs/tests/dummy-secrets>;
- lass = "/home/lass/secrets/${name}";
- };
- stockholm.file = toString <stockholm>;
- nixpkgs.git = {
- url = http://cgit.lassul.us/nixpkgs;
- # nixos-17.03
- # + copytoram:
- # 87a4615 & 334ac4f
- # + acme permissions for groups
- # fd7a8f1
- ref = "fe46ffc";
- };
- }
+ evalSource (toString _file) [
+ {
+ nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
+ nixpkgs.git = {
+ url = http://cgit.lassul.us/nixpkgs;
+ # nixos-17.03
+ # + copytoram:
+ # 87a4615 & 334ac4f
+ # + acme permissions for groups
+ # fd7a8f1
+ ref = "fe46ffc";
+ };
+ secrets.file = getAttr builder {
+ buildbot = toString <stockholm/lass/2configs/tests/dummy-secrets>;
+ lass = "/home/lass/secrets/${name}";
+ };
+ stockholm.file = toString <stockholm>;
+ }
+ override
+ ]