diff options
author | lassulus <lass@blue.r> | 2018-07-28 19:19:17 +0200 |
---|---|---|
committer | lassulus <lass@blue.r> | 2018-07-28 19:19:17 +0200 |
commit | 8d281b3dde22cca048b1ea02360906c66a7f4246 (patch) | |
tree | 6faa37ffa82718e2b164aaafdc44bf79df8b3430 /makefu/1systems/wbob | |
parent | 2712a197eb1e9a0534fe949594ad9f5f2206d195 (diff) | |
parent | 54990bce8941dfc9b38504fbff357cadd66354a3 (diff) |
Merge remote-tracking branch 'prism/makefu'
Diffstat (limited to 'makefu/1systems/wbob')
-rw-r--r-- | makefu/1systems/wbob/config.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index df317a016..7c81a2015 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -43,16 +43,18 @@ in { <stockholm/makefu/2configs/stats/external/aralast.nix> <stockholm/makefu/2configs/stats/telegraf/airsensor.nix> # <stockholm/makefu/2configs/stats/telegraf/bamstats.nix> + <stockholm/makefu/2configs/hw/mceusb.nix> <stockholm/makefu/2configs/deployment/bureautomation> (let collectd-port = 25826; influx-port = 8086; + admin-port = 8083; grafana-port = 3000; # TODO nginx forward db = "collectd_db"; logging-interface = "enp0s25"; in { - networking.firewall.allowedTCPPorts = [ 3000 ]; + networking.firewall.allowedTCPPorts = [ 3000 influx-port admin-port ]; services.grafana.enable = true; services.grafana.addr = "0.0.0.0"; @@ -61,7 +63,7 @@ in { meta.hostname = config.krebs.build.host.name; # meta.logging-enabled = true; http.bind-address = ":${toString influx-port}"; - admin.bind-address = ":8083"; + admin.bind-address = ":${toString admin-port}"; collectd = [{ enabled = true; typesdb = "${pkgs.collectd}/share/collectd/types.db"; @@ -125,7 +127,6 @@ in { networking.firewall.allowedTCPPorts = [ 655 8081 #smokeping - 8086 #influx 49152 ]; networking.firewall.trustedInterfaces = [ "enp0s25" ]; |