gum/share/hetzner-cifs: fix issues with reboot

for real this time!
This commit is contained in:
makefu 2023-07-09 17:40:17 +02:00
parent 1a00859ad7
commit 80dbf71a6f
No known key found for this signature in database
GPG key ID: 36F7711F3FC0F225
5 changed files with 10 additions and 10 deletions

View file

@ -13,6 +13,7 @@ in {
fileSystems."${wwwdir}" = { fileSystems."${wwwdir}" = {
device = storedir; device = storedir;
options = [ "bind" ]; options = [ "bind" ];
depends = [ "/media/cloud" ];
}; };
services.openssh = { services.openssh = {

View file

@ -57,7 +57,7 @@ in {
users.users.nextcloud.extraGroups = [ "download" ]; users.users.nextcloud.extraGroups = [ "download" ];
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud25; package = pkgs.nextcloud26;
hostName = "o.euer.krebsco.de"; hostName = "o.euer.krebsco.de";
# Use HTTPS for links # Use HTTPS for links
https = true; https = true;

View file

@ -2,12 +2,13 @@
let let
automount_opts = automount_opts =
[ "x-systemd.automount" "noauto" [ "x-systemd.automount","nofail"
"x-systemd.idle-timeout=300" "x-systemd.idle-timeout=300"
"x-systemd.mount-timeout=60s" "x-systemd.mount-timeout=60s"
]; ];
host = "gum.w"; #TODO host = "gum.w";
in { in {
sops.secrets."download.smb" = {};
boot.extraModprobeConfig = '' boot.extraModprobeConfig = ''
options cifs CIFSMaxBufSize=130048 options cifs CIFSMaxBufSize=130048
''; '';
@ -15,7 +16,7 @@ in {
device = "//${host}/cloud-proxy"; device = "//${host}/cloud-proxy";
fsType = "cifs"; fsType = "cifs";
options = automount_opts ++ options = automount_opts ++
[ "credentials=/var/src/secrets/download.smb" [ "credentials=${config.sops.secrets."download.smb".path}"
"file_mode=0775" "file_mode=0775"
"dir_mode=0775" "dir_mode=0775"
"bsize=8388608" "bsize=8388608"

View file

@ -1,19 +1,17 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with <stockholm/lib>;
let let
automount_opts = automount_opts = ["nofail" "_netdev" "soft" "x-systemd.automount"];
["nofail"
];
host = "u288834.your-storagebox.de"; host = "u288834.your-storagebox.de";
in { in {
boot.kernel.sysctl."net.ipv6.route.max_size" = 2147483647; boot.kernel.sysctl."net.ipv6.route.max_size" = 2147483647;
sops.secrets."hetzner.smb" = {};
fileSystems."/media/cloud" = { fileSystems."/media/cloud" = {
device = "//${host}/backup"; device = "//${host}/backup";
fsType = "cifs"; fsType = "cifs";
options = automount_opts ++ options = automount_opts ++
[ "credentials=${toString <secrets/hetzner.smb>}" [ "credentials=${config.sops.secrets."hetzner.smb".path}"
"file_mode=0770" "file_mode=0770"
"dir_mode=0770" "dir_mode=0770"
"uid=${toString config.users.users.download.uid}" "uid=${toString config.users.users.download.uid}"

View file

@ -7,7 +7,7 @@ let
"x-systemd.device-timeout=5s" "x-systemd.device-timeout=5s"
"x-systemd.mount-timeout=5s" "x-systemd.mount-timeout=5s"
]; ];
host = "omo.lan"; #TODO host = "omo.lan";
path = "/media/omo/photos"; path = "/media/omo/photos";
in { in {
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [