summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-10-08 21:25:00 +0200
committermakefu <github@syntax-fehler.de>2017-10-08 21:25:00 +0200
commit32e6aed36ae2ec79ca19d375241c2f4c8490254d (patch)
tree4c220f476af3c035f2c5bf0aa1d4d1d07f3a76bd
parentfe10f694af00f3e0f4569759ed47e590182e26e7 (diff)
parent1124548642eeda9225cd223b2c4de12e0240d02f (diff)
Merge remote-tracking branch 'lass/master'
-rw-r--r--krebs/1systems/hotdog/config.nix2
-rw-r--r--krebs/2configs/reaktor-krebs.nix (renamed from lass/2configs/reaktor-krebs.nix)0
-rw-r--r--krebs/2configs/reaktor-retiolum.nix (renamed from lass/2configs/reaktor-retiolum.nix)0
-rw-r--r--lass/1systems/prism/config.nix2
4 files changed, 2 insertions, 2 deletions
diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index 7f49f9485..4fdb53ae7 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -13,6 +13,8 @@
<stockholm/krebs/2configs/gitlab-runner-shackspace.nix>
<stockholm/krebs/2configs/binary-cache/nixos.nix>
<stockholm/krebs/2configs/ircd.nix>
+ <stockholm/krebs/2configs/reaktor-krebs.nix>
+ <stockholm/krebs/2configs/reaktor-retiolum.nix>
];
krebs.build.host = config.krebs.hosts.hotdog;
diff --git a/lass/2configs/reaktor-krebs.nix b/krebs/2configs/reaktor-krebs.nix
index 6b17b457d..6b17b457d 100644
--- a/lass/2configs/reaktor-krebs.nix
+++ b/krebs/2configs/reaktor-krebs.nix
diff --git a/lass/2configs/reaktor-retiolum.nix b/krebs/2configs/reaktor-retiolum.nix
index 144b7d484..144b7d484 100644
--- a/lass/2configs/reaktor-retiolum.nix
+++ b/krebs/2configs/reaktor-retiolum.nix
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 8e44b113b..eadda5270 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -230,8 +230,6 @@ in {
<stockholm/lass/2configs/paste.nix>
<stockholm/lass/2configs/syncthing.nix>
<stockholm/lass/2configs/reaktor-coders.nix>
- <stockholm/lass/2configs/reaktor-krebs.nix>
- <stockholm/lass/2configs/reaktor-retiolum.nix>
<stockholm/lass/2configs/ciko.nix>
<stockholm/lass/2configs/container-networking.nix>
{ # quasi bepasty.nix