Add smb mount instead

keys/secrets.nix

@@ -15,4 +15,5 @@ in
   "wg-ren.priv".publicKeys = macbook++master++ren;
   "ren.priv".publicKeys = master ++ ren;
   "mullvad".publicKeys = master ++ ren ++ macbook;
+  "smbshare".publicKeys = master ++ macbook ++ ren ++ selene;
 }

keys/smbshare

@@ -0,0 +1,13 @@
+age-encryption.org/v1
+-> ssh-ed25519 CJLJQg iKSC2yZMoiMcQ/uphfV9KSPaMZDujTJ8RF9iNj2cwl0
+naZwmb0c73GsZmLnoOLFjPFLahIvJ9uNPm9eKn9wuk4
+-> ssh-ed25519 M7OTMg OzqVt888r84ORO8K+sGPUktLe0Hlex5mH6tveRE+Nmo
+hB69RP7R9mAPOtnYF27c+vs3lJfmo2HLygpUPCdg4o4
+-> ssh-ed25519 uNZY8Q rSg+s2zyvi+pc8f+2+jpoV2d4QnSK6bc5FlUJYUvKn0
+vQ4DrQjuU+6SMF74qYIljm47DiwgFRTe0jOHgRhZhP8
+-> ssh-ed25519 gSqcWw tb4ZOplFZCXerynrFIRjTJ6s/itwRmsVeJSxDpf7NmE
+n8dmh88E/gSr8TGUxNGEYz5JoAczN/PeCXEEAPzATh0
+-> ssh-ed25519 lFtjmQ hILkY+TxULWVfFsm7iF+W5lARxBl3MdWEerO6JHYIhQ
+Q7xEwwZ3RM73a0lLs63TKKfHKrK7+YWKYpW27brwlOQ
+--- fjttmh2HNROYUIMYVu1Yxft9diCU4tx+DIFYBeEUelc
+ൊ0÷ÌšŸH®³÷•XgÌlgIÑ­ØÛn—Ü^]¾„Gx°Bµp1‰K*‚Ê(ê<>mCŽu^V¦_h"KÄìüi)üœÄ÷ü}–7ÈÛ<C383>ÇÜ]¿‘ϩЉñõjóÂàR›Ý xÝ¿=÷
õ´ÉŒìqÔîžÞ‚¥×³

systems/ren/volumes.nix

@@ -3,6 +3,7 @@
   environment.systemPackages = [
     pkgs.rclone
     pkgs.samba
+    pkgs.cifs-utils
   ];
   environment.etc."rclone-mnt.conf".text = ''
     [myremote]
@@ -12,16 +13,21 @@
     key_file = ${config.age.secrets.hetzner-key.path}
   '';
 
+  age.secrets.smbsecret = {
+    file = ../../keys/smbshare;
+    owner = "ren";
+  };
+
   fileSystems."/mnt/sbox" = {
-    device = "myremote:/";
+    device = "//u504615.your-storagebox.de/backup";
-    fsType = "rclone";
+    fsType = "cifs";
-    options = [
+    options =
-      "nodev"
+      let
-      "nofail"
+        # this line prevents hanging on network split
-      "allow_other"
+        automount_opts = "rw,x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,dir_mode=0777";
-      "args2env"
+
-      "config=/etc/rclone-mnt.conf"
+      in
-    ];
+      [ "${automount_opts},credentials=${config.age.secrets.smbsecret.path}" ];
   };
 
   fileSystems."/mnt/scratch" = {

systems/selene/volumes.nix

@@ -20,24 +20,27 @@
     ];
   };
 
-  environment.systemPackages = [ pkgs.rclone ];
+
-  environment.etc."rclone-mnt.conf".text = ''
+  environment.systemPackages = [
-    [myremote]
+    pkgs.rclone
-    type = sftp
+    pkgs.samba
-    host = u504615.your-storagebox.de
+    pkgs.cifs-utils
-    user = u504615
+  ];
-    key_file = ${config.age.secrets.hetzner-key.path}
+
-  '';
+  age.secrets.smbsecret = {
+    file = ../../keys/smbshare;
+    owner = "selene";
+  };
 
   fileSystems."/mnt/sbox" = {
-    device = "myremote:/";
+    device = "//u504615.your-storagebox.de/backup";
-    fsType = "rclone";
+    fsType = "cifs";
-    options = [
+    options =
-      "nodev"
+      let
-      "nofail"
+        # this line prevents hanging on network split
-      "allow_other"
+        automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
-      "args2env"
+
-      "config=/etc/rclone-mnt.conf"
+      in
-    ];
+      [ "${automount_opts},credentials=${config.age.secrets.smbsecret.path}" ];
   };
 }