diff options
| author | tv <tv@krebsco.de> | 2018-12-18 20:17:03 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-12-18 20:17:03 +0100 |
| commit | 1fa1fa53062069de970548f88ad0211b4502f18d (patch) | |
| tree | 30413fa29c1c43ff7af5ea684d92e613de4af295 /makefu/1systems/omo | |
| parent | 8b4428816d1385e1dd5ec9bf0ce44ae0e284130a (diff) | |
| parent | 23562e36190e07f338211541ac3d2cc77ebdbafa (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/omo')
| -rw-r--r-- | makefu/1systems/omo/config.nix | 6 | ||||
| -rw-r--r-- | makefu/1systems/omo/hw/omo.nix | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 260f96081..81b1e0ea1 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -44,7 +44,8 @@ in { # <stockholm/makefu/2configs/share/omo-timemachine.nix> <stockholm/makefu/2configs/tinc/retiolum.nix> - + # statistics + <stockholm/makefu/2configs/stats/client.nix> # Logging #influx + grafana <stockholm/makefu/2configs/stats/server.nix> @@ -74,7 +75,8 @@ in { "homeassistant-0.77.2" ]; } - <stockholm/makefu/2configs/deployment/homeautomation> + <stockholm/makefu/2configs/homeautomation> + <stockholm/makefu/2configs/homeautomation/google-muell.nix> { makefu.ps3netsrv = { enable = true; diff --git a/makefu/1systems/omo/hw/omo.nix b/makefu/1systems/omo/hw/omo.nix index 1b618a486..31db335bb 100644 --- a/makefu/1systems/omo/hw/omo.nix +++ b/makefu/1systems/omo/hw/omo.nix @@ -48,9 +48,8 @@ in { makefu.snapraid = { enable = true; - # TODO: 3 is not protected - disks = map toMapper [ 0 1 ]; - parity = toMapper 2; + disks = map toMapper [ 0 2 3 ]; + parity = toMapper 1; }; fileSystems = let cryptMount = name: |