summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-07-15 18:57:16 +0200
committermakefu <github@syntax-fehler.de>2017-07-15 18:57:16 +0200
commitfa38155eec9563dc9dc620a77900d87b97443cfe (patch)
tree6000436cba63e03a21556fb6c2d6ebb67eb5b3b0
parent3698f2a40c2db7df0888974c9b2e347947088a98 (diff)
ma: move systems to subdir, init source
-rw-r--r--makefu/1systems/darth/config.nix (renamed from makefu/1systems/darth.nix)0
-rw-r--r--makefu/1systems/drop/config.nix (renamed from makefu/1systems/drop.nix)0
-rw-r--r--makefu/1systems/fileleech/config.nix (renamed from makefu/1systems/fileleech.nix)0
-rw-r--r--makefu/1systems/filepimp/config.nix (renamed from makefu/1systems/filepimp.nix)0
-rw-r--r--makefu/1systems/gum/config.nix (renamed from makefu/1systems/gum.nix)0
-rw-r--r--makefu/1systems/iso/config.nix (renamed from makefu/1systems/iso.nix)0
-rw-r--r--makefu/1systems/omo/config.nix (renamed from makefu/1systems/omo.nix)0
-rw-r--r--makefu/1systems/pnp/config.nix (renamed from makefu/1systems/pnp.nix)0
-rw-r--r--makefu/1systems/repunit/config.nix (renamed from makefu/1systems/repunit.nix)0
-rw-r--r--makefu/1systems/sdev/config.nix (renamed from makefu/1systems/sdev.nix)0
-rw-r--r--makefu/1systems/shoney/config.nix (renamed from makefu/1systems/shoney.nix)0
-rw-r--r--makefu/1systems/studio/config.nix (renamed from makefu/1systems/studio.nix)0
-rw-r--r--makefu/1systems/tsp/config.nix (renamed from makefu/1systems/tsp.nix)0
-rw-r--r--makefu/1systems/vbob/config.nix (renamed from makefu/1systems/vbob.nix)0
-rw-r--r--makefu/1systems/wbob/config.nix (renamed from makefu/1systems/wbob.nix)0
-rw-r--r--makefu/1systems/wry/config.nix (renamed from makefu/1systems/wry.nix)0
-rw-r--r--makefu/1systems/x/config.nix (renamed from makefu/1systems/x.nix)0
-rw-r--r--makefu/source.nix29
18 files changed, 29 insertions, 0 deletions
diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth/config.nix
index b39021176..b39021176 100644
--- a/makefu/1systems/darth.nix
+++ b/makefu/1systems/darth/config.nix
diff --git a/makefu/1systems/drop.nix b/makefu/1systems/drop/config.nix
index 4a94c3f61..4a94c3f61 100644
--- a/makefu/1systems/drop.nix
+++ b/makefu/1systems/drop/config.nix
diff --git a/makefu/1systems/fileleech.nix b/makefu/1systems/fileleech/config.nix
index 3aa5a54f8..3aa5a54f8 100644
--- a/makefu/1systems/fileleech.nix
+++ b/makefu/1systems/fileleech/config.nix
diff --git a/makefu/1systems/filepimp.nix b/makefu/1systems/filepimp/config.nix
index e143d0046..e143d0046 100644
--- a/makefu/1systems/filepimp.nix
+++ b/makefu/1systems/filepimp/config.nix
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum/config.nix
index 51761d3fd..51761d3fd 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum/config.nix
diff --git a/makefu/1systems/iso.nix b/makefu/1systems/iso/config.nix
index c679241e5..c679241e5 100644
--- a/makefu/1systems/iso.nix
+++ b/makefu/1systems/iso/config.nix
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo/config.nix
index 0f1b8e0da..0f1b8e0da 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo/config.nix
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp/config.nix
index 971676b79..971676b79 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp/config.nix
diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit/config.nix
index 7102b8f81..7102b8f81 100644
--- a/makefu/1systems/repunit.nix
+++ b/makefu/1systems/repunit/config.nix
diff --git a/makefu/1systems/sdev.nix b/makefu/1systems/sdev/config.nix
index 233f7cefa..233f7cefa 100644
--- a/makefu/1systems/sdev.nix
+++ b/makefu/1systems/sdev/config.nix
diff --git a/makefu/1systems/shoney.nix b/makefu/1systems/shoney/config.nix
index 9f04e97eb..9f04e97eb 100644
--- a/makefu/1systems/shoney.nix
+++ b/makefu/1systems/shoney/config.nix
diff --git a/makefu/1systems/studio.nix b/makefu/1systems/studio/config.nix
index f7d49cac6..f7d49cac6 100644
--- a/makefu/1systems/studio.nix
+++ b/makefu/1systems/studio/config.nix
diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp/config.nix
index 25fc2b49b..25fc2b49b 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp/config.nix
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob/config.nix
index d8e275bf6..d8e275bf6 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob/config.nix
diff --git a/makefu/1systems/wbob.nix b/makefu/1systems/wbob/config.nix
index 5d0dd4a79..5d0dd4a79 100644
--- a/makefu/1systems/wbob.nix
+++ b/makefu/1systems/wbob/config.nix
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry/config.nix
index f5097bf40..f5097bf40 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry/config.nix
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x/config.nix
index 235862e85..235862e85 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x/config.nix
diff --git a/makefu/source.nix b/makefu/source.nix
new file mode 100644
index 000000000..18733ee5c
--- /dev/null
+++ b/makefu/source.nix
@@ -0,0 +1,29 @@
+with import <stockholm/lib>;
+host@{ name, secure ? false, override ? {} }: let
+ builder = if getEnv "dummy_secrets" == "true"
+ then "buildbot"
+ else "tv";
+ _file = <stockholm> + "/tv/1systems/${name}/source.nix";
+in
+ evalSource (toString _file) [
+ {
+ nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix";
+ nixpkgs.git = {
+ # nixos-17.03
+ ref = mkDefault "94941cb0455bfc50b1bf63186cfad7136d629f78";
+ url = https://github.com/NixOS/nixpkgs;
+ };
+ secrets.file = getAttr builder {
+ buildbot = toString <stockholm/tv/dummy_secrets>;
+ tv = "/home/tv/secrets/${name}";
+ };
+ stockholm.file = toString <stockholm>;
+ }
+ (mkIf (builder == "tv") {
+ secrets-common.file = "/home/tv/secrets/common";
+ })
+ (mkIf (builder == "tv" && secure) {
+ secrets-master.file = "/home/tv/secrets/master";
+ })
+ override
+ ]