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/omo | |
| parent | 5030b74cc5c578bb82619a24592504a6008f1a10 (diff) | |
| parent | 8705b4dbc8e8cf0c4e09c114daad3f96026520ab (diff) | |
Merge branch 'master' of prism.r:stockholm
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: |