diff options
| author | tv <tv@krebsco.de> | 2020-10-03 13:44:30 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2020-10-03 13:44:30 +0200 |
| commit | d1e52425e0d5d79a33b11c92cc2afb498075d953 (patch) | |
| tree | 29277982f014eaae680e006b6afc7fdb42e8d9b2 /lass/1systems/prism | |
| parent | 654f64f05935a69607a540f2e8d15619cee9e15e (diff) | |
| parent | 7e7499d86302d261c8f8404fb34f2ac091318d0e (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/prism')
| -rw-r--r-- | lass/1systems/prism/config.nix | 9 | ||||
| -rw-r--r-- | lass/1systems/prism/physical.nix | 10 |
2 files changed, 16 insertions, 3 deletions
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 33ec21e72..b335353be 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -272,9 +272,9 @@ with import <stockholm/lib>; resolveLocalQueries = false; extraConfig= '' - listen-address=42:1:ce16::1 + listen-address=42:1:ce16::1,10.244.1.103 except-interface=lo - interface=wg0 + interface=wiregrill ''; }; } @@ -284,7 +284,10 @@ with import <stockholm/lib>; ]; } { - services.murmur.enable = true; + services.murmur = { + enable = true; + bandwidth = 10000000; + }; services.murmur.registerName = "lassul.us"; krebs.iptables.tables.filter.INPUT.rules = [ { predicate = "-p tcp --dport 64738"; target = "ACCEPT";} diff --git a/lass/1systems/prism/physical.nix b/lass/1systems/prism/physical.nix index 7458f5ffd..1a3bee850 100644 --- a/lass/1systems/prism/physical.nix +++ b/lass/1systems/prism/physical.nix @@ -55,6 +55,16 @@ fsType = "zfs"; }; + fileSystems."/var/realwallpaper/archive" = { + device = "tank/wallpaper"; + fsType = "zfs"; + }; + + fileSystems."/home/xanf" = { + device = "/dev/disk/by-id/wwn-0x500a07511becb076"; + fsType = "ext4"; + }; + nix.maxJobs = lib.mkDefault 8; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; |