diff --git a/2configs/bgt/download.binaergewitter.de.nix b/2configs/bgt/download.binaergewitter.de.nix index ae8ae62..eb77d89 100644 --- a/2configs/bgt/download.binaergewitter.de.nix +++ b/2configs/bgt/download.binaergewitter.de.nix @@ -13,6 +13,7 @@ in { fileSystems."${wwwdir}" = { device = storedir; options = [ "bind" ]; + depends = [ "/media/cloud" ]; }; services.openssh = { diff --git a/2configs/deployment/owncloud.nix b/2configs/deployment/owncloud.nix index 05dc54f..b9f05e9 100644 --- a/2configs/deployment/owncloud.nix +++ b/2configs/deployment/owncloud.nix @@ -57,7 +57,7 @@ in { users.users.nextcloud.extraGroups = [ "download" ]; services.nextcloud = { enable = true; - package = pkgs.nextcloud25; + package = pkgs.nextcloud26; hostName = "o.euer.krebsco.de"; # Use HTTPS for links https = true; diff --git a/2configs/share/gum-client.nix b/2configs/share/gum-client.nix index 09a3dd7..5c7f407 100644 --- a/2configs/share/gum-client.nix +++ b/2configs/share/gum-client.nix @@ -2,12 +2,13 @@ let automount_opts = - [ "x-systemd.automount" "noauto" + [ "x-systemd.automount","nofail" "x-systemd.idle-timeout=300" "x-systemd.mount-timeout=60s" ]; - host = "gum.w"; #TODO + host = "gum.w"; in { + sops.secrets."download.smb" = {}; boot.extraModprobeConfig = '' options cifs CIFSMaxBufSize=130048 ''; @@ -15,7 +16,7 @@ in { device = "//${host}/cloud-proxy"; fsType = "cifs"; options = automount_opts ++ - [ "credentials=/var/src/secrets/download.smb" + [ "credentials=${config.sops.secrets."download.smb".path}" "file_mode=0775" "dir_mode=0775" "bsize=8388608" diff --git a/2configs/share/hetzner-client.nix b/2configs/share/hetzner-client.nix index 9713b77..fde4193 100644 --- a/2configs/share/hetzner-client.nix +++ b/2configs/share/hetzner-client.nix @@ -1,19 +1,17 @@ { config, lib, pkgs, ... }: -with ; let - automount_opts = - ["nofail" - ]; + automount_opts = ["nofail" "_netdev" "soft" "x-systemd.automount"]; host = "u288834.your-storagebox.de"; in { boot.kernel.sysctl."net.ipv6.route.max_size" = 2147483647; + sops.secrets."hetzner.smb" = {}; fileSystems."/media/cloud" = { device = "//${host}/backup"; fsType = "cifs"; options = automount_opts ++ - [ "credentials=${toString }" + [ "credentials=${config.sops.secrets."hetzner.smb".path}" "file_mode=0770" "dir_mode=0770" "uid=${toString config.users.users.download.uid}" diff --git a/2configs/share/omo-client.nix b/2configs/share/omo-client.nix index 4ad32bd..0d98af8 100644 --- a/2configs/share/omo-client.nix +++ b/2configs/share/omo-client.nix @@ -7,7 +7,7 @@ let "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" ]; - host = "omo.lan"; #TODO + host = "omo.lan"; path = "/media/omo/photos"; in { systemd.tmpfiles.rules = [