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): 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

1
modules/extern/misc/sssd.nix vendored
View file

@ -1,5 +1,6 @@
{ ... }: {
imports = [
../../nixos/sssd/sssd.nix
../../nixos/sssd/pam.nix
];
}

89
modules/extern/nixos/krb5.nix vendored
View file

@ -7,10 +7,10 @@
...
}: let
inherit (gensokyo-zone.lib) mkAlmostOptionDefault mapOptionDefaults mapAlmostOptionDefaults;
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.modules) mkIf mkMerge mkBefore mkAfter mkDefault mkOptionDefault;
inherit (lib.lists) optional;
inherit (lib.strings) toUpper;
inherit (lib.options) mkOption mkEnableOption mkPackageOption;
inherit (lib.modules) mkIf mkMerge mkBefore mkAfter mkForce mkDefault mkOptionDefault;
inherit (lib.lists) optional elem;
inherit (lib.strings) toUpper concatStringsSep;
inherit (gensokyo-zone.lib) unmerged;
cfg = config.gensokyo-zone.krb5;
krb5Module = {
@ -127,6 +127,25 @@
};
nfs = {
enable = mkEnableOption "nfs";
package = mkPackageOption pkgs "nfs-utils" { };
idmapd = {
localDomain = mkOption {
type = bool;
default = enabled.sssd && nixosConfig.services.sssd.services.nss.enable;
};
localRealms = mkOption {
type = listOf str;
default = [ config.realm ];
};
methods = mkOption {
type = listOf str;
default = [ "nsswitch" ];
};
authToLocalNames = mkOption {
type = attrsOf str;
default = config.authToLocalNames;
};
};
debug.enable = mkEnableOption "nfs debug logs";
};
ipa = {
@ -188,6 +207,19 @@
};
};
db.backend = mkIf enabled.ipa (mkAlmostOptionDefault "ipa");
nfs = {
package = mkIf (elem "umich_ldap" config.nfs.idmapd.methods) (mkAlmostOptionDefault pkgs.nfs-utils-ldap);
idmapd = {
methods = mkMerge [
(mkIf (config.nfs.idmapd.authToLocalNames != { }) (
mkOptionDefault (mkBefore [ "static" ])
))
(mkIf (!enabled.sssd) (
mkOptionDefault [ "umich_ldap" ]
))
];
};
};
set = {
krb5Settings = {
enable = mkAlmostOptionDefault true;
@ -252,9 +284,10 @@
realm = config.realm;
server = config.ipa.server;
# TODO: dyndns?
overrideConfigs = {
sssd = mkAlmostOptionDefault false;
krb5 = mkAlmostOptionDefault false;
} // {
overrideConfigs = mapAlmostOptionDefaults {
sssd = false;
krb5 = false;
};
});
nfsSettings = mkIf config.nfs.enable {
@ -305,10 +338,32 @@
rpc-verbosity = 3
'')
];
idmapd.settings = mkIf false {
#General.Domain = mkForce config.domain;
#Local-Realms = concatStringsSep "," [ config.realm nixosConfig.networking.domain ];
#Translation.Method = mkForce (concatStringsSep "," [ "static" "nsswitch" ]);
# TODO: move this into a more generic /modules/nixos/nfs that gets configured...
idmapd.settings = {
General = mkIf config.nfs.idmapd.localDomain {
Domain = mkForce config.domain;
Local-Realms = concatStringsSep "," config.nfs.idmapd.localRealms;
};
Translation.Method = mkIf (config.nfs.idmapd.methods != [ "nsswitch" ]) (mkForce (
concatStringsSep "," config.nfs.idmapd.methods
));
Static = mkIf (config.nfs.idmapd.authToLocalNames != { }) config.nfs.idmapd.authToLocalNames;
UMICH_SCHEMA = mkIf (elem "umich_ldap" config.nfs.idmapd.methods) (mapOptionDefaults {
LDAP_server = config.ldap.host;
LDAP_use_ssl = true;
LDAP_ca_cert = "/etc/ssl/certs/ca-bundle.crt";
LDAP_base = config.ldap.baseDn;
LDAP_people_base = "cn=users,cn=accounts,${config.ldap.baseDn}";
LDAP_group_base = "cn=groups,cn=accounts,${config.ldap.baseDn}";
NFSv4_person_objectclass = "posixaccount"; # or "person"?
NFSv4_name_attr = "krbCanonicalName"; # uid? cn? gecos?
GSS_principal_attr = "krbPrincipalName";
NFSv4_group_objectclass = "posixgroup";
NFSv4_group_attr = "cn";
#LDAP_use_memberof_for_groups = true;
#NFSv4_member_attr = "member";
LDAP_canonicalize_name = false;
});
};
};
};
@ -363,6 +418,18 @@ in {
${freeipa.config.access.address4ForNetwork.local} = mkBefore [ cfg.host ];
};
};
environment.etc = {
"request-key.conf" = mkIf (cfg.enable && cfg.nfs.enable && cfg.sssd.enable) {
source = let
nfsidmap = pkgs.writeShellScript "nfsidmap" ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${config.system.nssModules.path}"
exec ${cfg.nfs.package}/bin/nfsidmap "$@"
'';
in mkForce (pkgs.writeText "request-key.conf" ''
create id_resolver * * ${nfsidmap} -t 600 %k %d
'');
};
};
${if options ? sops.secrets then "sops" else null}.secrets = let
sopsFile = mkDefault ../secrets/krb5.yaml;
in mkIf cfg.enable {

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;
};