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

fix(extern): krb5+nfs

Browse source
This commit is contained in:
arcnmx 2024-04-09 13:51:35 -07:00
parent 8d1ab4405d
commit f91179a2d8
6 changed files with 158 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
inherit (lib.modules) mkIf mkMerge mkDefault mkOptionDefault;
inherit (gensokyo-zone.lib) unmerged;
cfg = config.gensokyo-zone.kyuuto;
nfsEnabled = config.boot.supportedFilesystems.nfs or config.boot.supportedFilesystems.nfs4 or false;
kyuutoModule = {
gensokyo-zone,
nixosConfig,
@ -112,7 +113,7 @@
setFilesystems = {
"/mnt/kyuuto-media" = mkIf config.media.enable {
device = mkMerge [
(mkIf config.nfs.enable "nfs.${config.domain}:/mnt/kyuuto-media")
(mkIf config.nfs.enable "nfs.${config.domain}:/srv/fs/kyuuto/media")
(mkIf config.smb.enable (
if config.smb.user != null && access.local.enable
then ''\\smb.${config.domain}\kyuuto-media''
@ -134,7 +135,7 @@
};
"/mnt/kyuuto-transfer" = mkIf config.transfer.enable {
device = mkMerge [
(mkIf config.nfs.enable "nfs.${config.domain}:/mnt/kyuuto-media/transfer")
(mkIf config.nfs.enable "nfs.${config.domain}:/srv/fs/kyuuto/transfer")
(mkIf (config.smb.enable && access.local.enable) ''\\smb.${config.domain}\kyuuto-transfer'')
];
fsType = mkMerge [
@ -177,6 +178,10 @@ in {
fileSystems = mkIf cfg.enable (
unmerged.mergeAttrs cfg.setFilesystems
);
systemd.services.rpc-svcgssd = mkIf (!config.services.nfs.server.enable && nfsEnabled) {
enable = false;
};
lib.gensokyo-zone.kyuuto = {
inherit cfg kyuutoModule;
};