From 7540c3cb1bfd97bfadf0dc70af4cbe370ed5575a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 25 May 2017 23:19:36 +0200
Subject: [PATCH] m 2: rename stats and share

---
 1systems/gum.nix                                    |  6 +++---
 1systems/omo.nix                                    | 13 ++++++++-----
 .../{central-logging-client.nix => client.nix}      |  0
 .../{central-logging-server.nix => server.nix}      |  0
 2configs/{gum-share.nix => share/gum.nix}           |  0
 2configs/{omo-share.nix => share/omo.nix}           |  0
 2configs/{ => share}/temp-share-samba.nix           |  0
 .../central-stats-client.nix => stats/client.nix}   |  0
 2configs/{logging => stats}/external/aralast.nix    |  0
 .../central-stats-server.nix => stats/server.nix}   |  0
 10 files changed, 11 insertions(+), 8 deletions(-)
 rename 2configs/logging/{central-logging-client.nix => client.nix} (100%)
 rename 2configs/logging/{central-logging-server.nix => server.nix} (100%)
 rename 2configs/{gum-share.nix => share/gum.nix} (100%)
 rename 2configs/{omo-share.nix => share/omo.nix} (100%)
 rename 2configs/{ => share}/temp-share-samba.nix (100%)
 rename 2configs/{logging/central-stats-client.nix => stats/client.nix} (100%)
 rename 2configs/{logging => stats}/external/aralast.nix (100%)
 rename 2configs/{logging/central-stats-server.nix => stats/server.nix} (100%)

diff --git a/1systems/gum.nix b/1systems/gum.nix
index ddff9f7..fb4fac3 100644
--- a/1systems/gum.nix
+++ b/1systems/gum.nix
@@ -32,7 +32,7 @@ in {
       ../2configs/tools/sec.nix
 
       # services
-      ../2configs/gum-share.nix
+      ../2configs/share/gum.nix
       ../2configs/sabnzbd.nix
       ../2configs/torrent.nix
       ../2configs/iodined.nix
@@ -64,8 +64,8 @@ in {
       ../2configs/syncthing.nix
 
       # ../2configs/opentracker.nix
-      ../2configs/logging/central-stats-client.nix
-      # ../2configs/logging/central-logging-client.nix
+      ../2configs/stats/client.nix
+      # ../2configs/logging/client.nix
 
   ];
   makefu.dl-dir = "/var/download";
diff --git a/1systems/omo.nix b/1systems/omo.nix
index 91785a0..0f1b8e0 100644
--- a/1systems/omo.nix
+++ b/1systems/omo.nix
@@ -50,11 +50,13 @@ in {
       # ../2configs/disable_v6.nix
       #../2configs/graphite-standalone.nix
       #../2configs/share-user-sftp.nix
-      ../2configs/omo-share.nix
+      ../2configs/share/omo.nix
       ../2configs/tinc/retiolum.nix
-      ../2configs/logging/central-stats-server.nix
-      # ../2configs/logging/central-logging-server.nix
-      ../2configs/logging/central-stats-client.nix
+
+      # Logging
+      ../2configs/stats/server.nix #influx + grafana
+      ../2configs/stats/client.nix
+      ../2configs/stats/external/aralast.nix # logs to influx
 
       # services
       ../2configs/syncthing.nix
@@ -180,7 +182,8 @@ in {
     uid = 9002;
     name = "misa";
   };
-  hardware.enableAllFirmware = true;
+  # hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
   hardware.cpu.intel.updateMicrocode = true;
 
   zramSwap.enable = true;
diff --git a/2configs/logging/central-logging-client.nix b/2configs/logging/client.nix
similarity index 100%
rename from 2configs/logging/central-logging-client.nix
rename to 2configs/logging/client.nix
diff --git a/2configs/logging/central-logging-server.nix b/2configs/logging/server.nix
similarity index 100%
rename from 2configs/logging/central-logging-server.nix
rename to 2configs/logging/server.nix
diff --git a/2configs/gum-share.nix b/2configs/share/gum.nix
similarity index 100%
rename from 2configs/gum-share.nix
rename to 2configs/share/gum.nix
diff --git a/2configs/omo-share.nix b/2configs/share/omo.nix
similarity index 100%
rename from 2configs/omo-share.nix
rename to 2configs/share/omo.nix
diff --git a/2configs/temp-share-samba.nix b/2configs/share/temp-share-samba.nix
similarity index 100%
rename from 2configs/temp-share-samba.nix
rename to 2configs/share/temp-share-samba.nix
diff --git a/2configs/logging/central-stats-client.nix b/2configs/stats/client.nix
similarity index 100%
rename from 2configs/logging/central-stats-client.nix
rename to 2configs/stats/client.nix
diff --git a/2configs/logging/external/aralast.nix b/2configs/stats/external/aralast.nix
similarity index 100%
rename from 2configs/logging/external/aralast.nix
rename to 2configs/stats/external/aralast.nix
diff --git a/2configs/logging/central-stats-server.nix b/2configs/stats/server.nix
similarity index 100%
rename from 2configs/logging/central-stats-server.nix
rename to 2configs/stats/server.nix