diff options
| author | jeschli <jeschli@gmail.com> | 2018-12-16 20:28:28 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-12-16 20:28:28 +0100 |
| commit | 8605ac91ae3a3859ab906a5fa2e9b0e3dfcd6e1e (patch) | |
| tree | 77618847347d2526897e94da744ab57588947567 /makefu/1systems/wbob | |
| parent | 5030b74cc5c578bb82619a24592504a6008f1a10 (diff) | |
| parent | 8705b4dbc8e8cf0c4e09c114daad3f96026520ab (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'makefu/1systems/wbob')
| -rw-r--r-- | makefu/1systems/wbob/config.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index f2311fb55..3930406b1 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -20,9 +20,6 @@ in { <stockholm/makefu/2configs/mqtt.nix> <stockholm/makefu/2configs/gui/wbob-kiosk.nix> - <stockholm/makefu/2configs/stats/client.nix> - - # <stockholm/makefu/2configs/gui/studio-virtual.nix> # <stockholm/makefu/2configs/audio/jack-on-pulse.nix> # <stockholm/makefu/2configs/audio/realtime-audio.nix> @@ -35,6 +32,8 @@ in { <stockholm/makefu/2configs/bluetooth-mpd.nix> # Sensors + <stockholm/makefu/2configs/stats/client.nix> + <stockholm/makefu/2configs/stats/collectd-client.nix> <stockholm/makefu/2configs/stats/telegraf> <stockholm/makefu/2configs/stats/telegraf/airsensor.nix> <stockholm/makefu/2configs/stats/telegraf/europastats.nix> @@ -51,9 +50,9 @@ in { "homeassistant-0.77.2" ]; } - <stockholm/makefu/2configs/deployment/bureautomation> - <stockholm/makefu/2configs/deployment/bureautomation/mpd.nix> - <stockholm/makefu/2configs/deployment/bureautomation/hass.nix> + <stockholm/makefu/2configs/bureautomation> + <stockholm/makefu/2configs/bureautomation/mpd.nix> + <stockholm/makefu/2configs/bureautomation/hass.nix> (let collectd-port = 25826; influx-port = 8086; |