summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2023-06-03 15:35:54 +0200
committermakefu <github@syntax-fehler.de>2023-06-03 15:35:54 +0200
commit5ae3892b6c4d27e545bf70609e263562731d91a8 (patch)
tree788ac769aee44bac27d7400f2f57068edc7e12f1
parentcd0e8501325fc782fc349cae65488d4843e3927b (diff)
ma share: try harder to start everything after cloud mount
-rw-r--r--makefu/2configs/nginx/euer.wiki.nix2
-rw-r--r--makefu/2configs/share/gum-client.nix2
-rw-r--r--makefu/2configs/share/hetzner-client.nix2
-rw-r--r--makefu/2configs/share/omo.nix1
4 files changed, 5 insertions, 2 deletions
diff --git a/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix
index 2f44d8cc1..a925b9f78 100644
--- a/makefu/2configs/nginx/euer.wiki.nix
+++ b/makefu/2configs/nginx/euer.wiki.nix
@@ -22,6 +22,8 @@ let
in {
state = [ base-dir ];
+ # hotfix for broken wiki after reboot
+ systemd.services."phpfpm-euer-wiki".serviceConfig.RequiresMountFor = [ "/media/cloud" ];
services.phpfpm = {
pools.euer-wiki = {
inherit user group;
diff --git a/makefu/2configs/share/gum-client.nix b/makefu/2configs/share/gum-client.nix
index 5192ef515..09a3dd733 100644
--- a/makefu/2configs/share/gum-client.nix
+++ b/makefu/2configs/share/gum-client.nix
@@ -6,7 +6,7 @@ let
"x-systemd.idle-timeout=300"
"x-systemd.mount-timeout=60s"
];
- host = "gum"; #TODO
+ host = "gum.w"; #TODO
in {
boot.extraModprobeConfig = ''
options cifs CIFSMaxBufSize=130048
diff --git a/makefu/2configs/share/hetzner-client.nix b/makefu/2configs/share/hetzner-client.nix
index f7afc6d57..9713b776a 100644
--- a/makefu/2configs/share/hetzner-client.nix
+++ b/makefu/2configs/share/hetzner-client.nix
@@ -3,7 +3,7 @@
with <stockholm/lib>;
let
automount_opts =
- ["nofail" "noempty"
+ ["nofail"
];
host = "u288834.your-storagebox.de";
in {
diff --git a/makefu/2configs/share/omo.nix b/makefu/2configs/share/omo.nix
index 4756ccf81..16959bc90 100644
--- a/makefu/2configs/share/omo.nix
+++ b/makefu/2configs/share/omo.nix
@@ -9,6 +9,7 @@ let
in {
# samba share /media/crypt1/share
+ systemd.services.samba-smbd.serviceConfig.RequiresMountFor = [ "/media/cryptX" ];
users.users.smbguest = {
name = "smbguest";
uid = config.ids.uids.smbguest;