gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(extern): mount unit timeouts

Browse source
This commit is contained in:
arcnmx 2024-04-16 03:54:30 -07:00
parent 4885858ba2
commit f2c7178486
1 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

36
modules/extern/nixos/kyuuto.nix vendored
View file

@ -1,11 +1,15 @@
{ {
config, config,
lib, lib,
utils,
gensokyo-zone, gensokyo-zone,
... ...
}: let }: let
inherit (lib.options) mkOption mkEnableOption; inherit (lib.options) mkOption mkEnableOption;
inherit (lib.modules) mkIf mkMerge mkDefault mkOptionDefault; inherit (lib.modules) mkIf mkMerge mkDefault mkOptionDefault;
inherit (lib.lists) optional;
inherit (lib.strings) concatMapStringsSep;
inherit (utils) escapeSystemdPath;
inherit (gensokyo-zone.lib) unmerged; inherit (gensokyo-zone.lib) unmerged;
cfg = config.gensokyo-zone.kyuuto; cfg = config.gensokyo-zone.kyuuto;
nfsEnabled = config.boot.supportedFilesystems.nfs or config.boot.supportedFilesystems.nfs4 or false; nfsEnabled = config.boot.supportedFilesystems.nfs or config.boot.supportedFilesystems.nfs4 or false;
@ -80,6 +84,11 @@
}; };
setFilesystems = mkOption { setFilesystems = mkOption {
type = unmerged.types.attrs; type = unmerged.types.attrs;
internal = true;
};
setUnits = mkOption {
type = unmerged.types.attrs;
internal = true;
}; };
}; };
config = { config = {
@ -155,6 +164,30 @@
options = mkMerge setFilesystemOptions; options = mkMerge setFilesystemOptions;
}; };
}; };
setUnits = let
netMountConfig = {
overrideStrategy = mkDefault "asDropin";
text = let
after =
optional nixosConfig.systemd.network.enable "systemd-networkd.service"
++ optional nixosConfig.networking.networkmanager.enable "NetworkManager.service"
++ optional nixosConfig.services.connman.enable "connman.service"
++ optional access.tail.enabled "tailscaled.service";
in ''
[Unit]
JobTimeoutSec=30
${concatMapStringsSep "\n" (unit: "After=${unit}") after}
[Mount]
ForceUnmount=true
TimeoutSec=30
'';
};
in {
"${escapeSystemdPath "/mnt/kyuuto-media"}.mount" = mkIf config.media.enable netMountConfig;
"${escapeSystemdPath "/mnt/kyuuto-transfer"}.mount" = mkIf config.transfer.enable netMountConfig;
"${escapeSystemdPath "/mnt/kyuuto-shared"}.mount" = mkIf (config.shared.enable && config.smb.enable) netMountConfig;
};
}; };
}; };
in { in {
@ -181,6 +214,9 @@ in {
systemd.services.rpc-svcgssd = mkIf (!config.services.nfs.server.enable && nfsEnabled) { systemd.services.rpc-svcgssd = mkIf (!config.services.nfs.server.enable && nfsEnabled) {
enable = false; enable = false;
}; };
systemd.units = mkIf cfg.enable (
unmerged.mergeAttrs cfg.setUnits
);
lib.gensokyo-zone.kyuuto = { lib.gensokyo-zone.kyuuto = {
inherit cfg kyuutoModule; inherit cfg kyuutoModule;