summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-09-18 02:16:12 +0200
committermakefu <github@syntax-fehler.de>2018-09-18 02:16:12 +0200
commit884c73d2c0542a303a8af93e522fc17e3578e622 (patch)
treefb011f6b60333e8cda0e963fea29124a0ef22f19 /makefu/1systems
parent20eebf0ca30f7fabf5cd818a81a9e60c487b0962 (diff)
ma homeautomation: add mqtt broker with acl
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/omo/config.nix8
-rw-r--r--makefu/1systems/omo/hw/tsp.nix3
2 files changed, 6 insertions, 5 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 8db333481..be49db024 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -36,12 +36,12 @@ in {
# logs to influx
<stockholm/makefu/2configs/stats/external/aralast.nix>
<stockholm/makefu/2configs/stats/telegraf>
- <stockholm/makefu/2configs/stats/telegraf/europastats.nix>
+ # <stockholm/makefu/2configs/stats/telegraf/europastats.nix>
+ <stockholm/makefu/2configs/stats/telegraf/hamstats.nix>
<stockholm/makefu/2configs/stats/arafetch.nix>
# services
<stockholm/makefu/2configs/syncthing.nix>
- <stockholm/makefu/2configs/mqtt.nix>
<stockholm/makefu/2configs/remote-build/slave.nix>
<stockholm/makefu/2configs/deployment/google-muell.nix>
<stockholm/makefu/2configs/virtualisation/docker.nix>
@@ -70,8 +70,8 @@ in {
# <stockholm/makefu/2configs/temp/rst-issue.nix>
];
- makefu.full-populate = true;
- krebs.rtorrent = {
+ makefu.full-populate = true;
+ krebs.rtorrent = (builtins.trace (builtins.toJSON config.services.telegraf.extraConfig)) {
downloadDir = lib.mkForce "/media/cryptX/torrent";
extraConfig = ''
upload_rate = 200
diff --git a/makefu/1systems/omo/hw/tsp.nix b/makefu/1systems/omo/hw/tsp.nix
index 99c558056..a289fadce 100644
--- a/makefu/1systems/omo/hw/tsp.nix
+++ b/makefu/1systems/omo/hw/tsp.nix
@@ -6,7 +6,8 @@ let
rev = "9c9b62e15e4ac11d4379e66b974f1389daf939fe";
});
cfg = fromJSON (readFile ../../hardware/tsp-disk.json);
- primaryInterface = "enp1s0";
+ # primaryInterface = "enp1s0";
+ primaryInterface = "wlp2s0";
rootDisk = "/dev/sda"; # TODO same as disko uses
in {
imports = [