From 6df0b60f8af8a486ec89f6630e827720efd445ca Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 17 Apr 2017 15:45:32 +0200
Subject: wolf: cleanup

---
 shared/1systems/wolf.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'shared/1systems')

diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index 722a08812..0b4448022 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -1,20 +1,18 @@
-{ config, lib, pkgs, ... }:
-
+{ config, pkgs, ... }:
 let
   shack-ip = config.krebs.build.host.nets.shack.ip4.addr;
-  internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
 in
 {
   imports = [
     ../.
     <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+    ../2configs/cgit-mirror.nix
     ../2configs/collectd-base.nix
-    ../2configs/shack-nix-cacher.nix
+    ../2configs/graphite.nix
+    ../2configs/repo-sync.nix
     ../2configs/shack-drivedroid.nix
+    ../2configs/shack-nix-cacher.nix
     ../2configs/shared-buildbot.nix
-    ../2configs/cgit-mirror.nix
-    ../2configs/repo-sync.nix
-    ../2configs/graphite.nix
     ../2configs/share-shack.nix
   ];
   # use your own binary cache, fallback use cache.nixos.org (which is used by
-- 
cgit v1.2.3


From c577d6b9972203941c577d9fb5488345d5fe84b5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 17 Apr 2017 16:22:09 +0200
Subject: krebs.nginx: RIP

---
 shared/1systems/test-all-krebs-modules.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'shared/1systems')

diff --git a/shared/1systems/test-all-krebs-modules.nix b/shared/1systems/test-all-krebs-modules.nix
index b42968cfb..39d7c494b 100644
--- a/shared/1systems/test-all-krebs-modules.nix
+++ b/shared/1systems/test-all-krebs-modules.nix
@@ -36,7 +36,6 @@ in {
       enable = true;
       tables = {};
     };
-    nginx.enable = true;
     realwallpaper.enable = true;
     tinc.retiolum.enable = true;
     retiolum-bootstrap.enable = true;
-- 
cgit v1.2.3


From 55b77bd2ece03769e6df3ebdfa891bc255f92665 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 19 Apr 2017 10:05:12 +0200
Subject: s 1 wolf: send stats to omo

---
 shared/1systems/wolf.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'shared/1systems')

diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index 0b4448022..75307be12 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -14,6 +14,7 @@ in
     ../2configs/shack-nix-cacher.nix
     ../2configs/shared-buildbot.nix
     ../2configs/share-shack.nix
+    ../2configs/central-stats-client.nix
   ];
   # use your own binary cache, fallback use cache.nixos.org (which is used by
   # apt-cacher-ng in first place)
-- 
cgit v1.2.3