summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vali.nix44
-rw-r--r--ymir.nix2
2 files changed, 23 insertions, 23 deletions
diff --git a/vali.nix b/vali.nix
index 6711e0f8..d6e6df4c 100644
--- a/vali.nix
+++ b/vali.nix
@@ -170,26 +170,26 @@ rec {
170 ''; 170 '';
171 }; 171 };
172 172
173 systemd.automounts = [ 173 # systemd.automounts = [
174 { enable = true; 174 # { enable = true;
175 where = "/var/media"; 175 # where = "/var/media";
176 automountConfig = { 176 # automountConfig = {
177 DirectoryMode = "555"; 177 # DirectoryMode = "555";
178 }; 178 # };
179 wantedBy = [ "remote-fs.target" ]; 179 # wantedBy = [ "remote-fs.target" ];
180 } 180 # }
181 ]; 181 # ];
182 182
183 systemd.mounts = [ 183 # systemd.mounts = [
184 { enable = true; 184 # { enable = true;
185 where = "/var/media"; 185 # where = "/var/media";
186 what = "media@hel.asgard.yggdrasil:/var/media"; 186 # what = "media@hel.asgard.yggdrasil:/var/media";
187 type = "fuse.sshfs"; 187 # type = "fuse.sshfs";
188 options = "idmap=user,IdentityFile=/home/gkleen/.ssh/media@hel,allow_other,reconnect,_netdev"; 188 # options = "idmap=user,IdentityFile=/home/gkleen/.ssh/media@hel,allow_other,reconnect,_netdev";
189 mountConfig = { 189 # mountConfig = {
190 Environment = "PATH=/run/current-system/sw/bin:/run/current/system/sw/sbin"; 190 # Environment = "PATH=/run/current-system/sw/bin:/run/current/system/sw/sbin";
191 DirectoryMode = "555"; 191 # DirectoryMode = "555";
192 }; 192 # };
193 } 193 # }
194 ]; 194 # ];
195} 195}
diff --git a/ymir.nix b/ymir.nix
index c0424354..fc794677 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -384,7 +384,7 @@ in rec {
384 luser_relay = gkleen+''${local} 384 luser_relay = gkleen+''${local}
385 385
386 # 1 GiB 386 # 1 GiB
387 message_size_limit = 1073741824 387 message_size_limit = 0
388 # 10 GiB 388 # 10 GiB
389 mailbox_size_limit = 10737418240 389 mailbox_size_limit = 10737418240
390 390