From bf2b814557634a14e7d0239bf61e760ce11b876c Mon Sep 17 00:00:00 2001 From: Miran Bastaja Date: Sat, 19 Oct 2024 23:16:26 +0200 Subject: sagittarius: switch storage box from samba to sftp --- hosts/sagittarius/default.nix | 13 ++++++++----- hosts/sagittarius/sops.nix | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'hosts') diff --git a/hosts/sagittarius/default.nix b/hosts/sagittarius/default.nix index 44a72b7..4b2246a 100644 --- a/hosts/sagittarius/default.nix +++ b/hosts/sagittarius/default.nix @@ -17,19 +17,22 @@ boot.loader.grub.device = "/dev/sda"; time.timeZone = "Europe/Helsinki"; - environment.systemPackages = [ pkgs.cifs-utils ]; + environment.systemPackages = [ pkgs.rclone ]; fileSystems."/mnt/storage-box" = { - device = "//u423859-sub3.your-storagebox.de/u423859-sub3"; - fsType = "cifs"; + device = "storage-box:/"; + fsType = "rclone"; options = let opts = lib.concatStringsSep "," [ - "x-systemd.automount" + "nodev" + "allow_other" + "args2env" + "config=${config.sops.secrets.storage-box-rclone-conf.path}" "noauto" + "x-systemd.automount" "x-systemd.idle-timeout=60" "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" - "credentials=${config.sops.secrets.samba-creds.path}" "gid=${toString config.users.groups.storage-box.gid}" ]; in diff --git a/hosts/sagittarius/sops.nix b/hosts/sagittarius/sops.nix index 01836b3..db70d49 100644 --- a/hosts/sagittarius/sops.nix +++ b/hosts/sagittarius/sops.nix @@ -9,9 +9,9 @@ sopsFile = ../../secrets/forgejo-runner-token.env; format = "dotenv"; }; - "samba-creds" = { - sopsFile = ../../secrets/sagittarius-samba-creds.env; - format = "dotenv"; + "storage-box-rclone-conf" = { + sopsFile = ../../secrets/storage-box-rclone.ini; + format = "ini"; }; }; }; -- cgit v1.3.1