diff options
| author | tv <tv@krebsco.de> | 2019-04-13 14:07:30 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2019-04-13 14:07:30 +0200 |
| commit | 0430fbbbfeef5f7d6188ec70d7f084ffa1cb1a46 (patch) | |
| tree | 38daa64159448bc750de5b3c6692c7e2027ed4c7 /lass/1systems/mors | |
| parent | 39fba33bed71c7553da47e56c5e34a0389950c71 (diff) | |
| parent | bb2f8b9b920287df33e194a3b62d86669d8e6ddd (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/mors')
| -rw-r--r-- | lass/1systems/mors/config.nix | 12 | ||||
| -rw-r--r-- | lass/1systems/mors/physical.nix | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index f35ebff56..fa5fb5518 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -36,7 +36,7 @@ with import <stockholm/lib>; <stockholm/lass/2configs/blue-host.nix> <stockholm/lass/2configs/network-manager.nix> <stockholm/lass/2configs/nfs-dl.nix> - <stockholm/lass/2configs/hardening.nix> + #<stockholm/lass/2configs/hardening.nix> { krebs.iptables.tables.filter.INPUT.rules = [ #risk of rain @@ -49,6 +49,16 @@ with import <stockholm/lib>; ]; } { + krebs.syncthing.folders = [ + { id = "contacts"; path = "/home/lass/contacts"; peers = [ "mors" "blue" "green" "phone" ]; } + { id = "the_playlist"; path = "/home/lass/tmp/the_playlist"; peers = [ "mors" "phone" ]; } + ]; + lass.ensure-permissions = [ + { folder = "/home/lass/contacts"; owner = "lass"; group = "syncthing"; } + { folder = "/home/lass/tmp/the_playlist"; owner = "lass"; group = "syncthing"; } + ]; + } + { lass.umts = { enable = true; modem = "/dev/serial/by-id/usb-Lenovo_F5521gw_2C7D8D7C35FC7040-if09"; diff --git a/lass/1systems/mors/physical.nix b/lass/1systems/mors/physical.nix index 680dc9bde..25425f146 100644 --- a/lass/1systems/mors/physical.nix +++ b/lass/1systems/mors/physical.nix @@ -15,6 +15,10 @@ device = "/dev/mapper/pool-virtual"; fsType = "ext4"; }; + "/backups" = { + device = "/dev/pool/backup"; + fsType = "ext4"; + }; }; services.udev.extraRules = '' |