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(samba): rename settings option

Browse source
This commit is contained in:
arcnmx 2024-09-12 16:55:39 -07:00
parent 98f28acc4f
commit ba69fb80ae
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/nixos/samba.nix
View file

@ -211,7 +211,8 @@ in {
type = nullOr path; type = nullOr path;
default = null; default = null;
}; };
settings = mkOption { # TODO: move to upstream settings!
settings' = mkOption {
type = attrsOf settingType; type = attrsOf settingType;
default = {}; default = {};
}; };
@ -269,7 +270,7 @@ in {
}; };
}) })
]; ];
settings = mkMerge ([ settings' = mkMerge ([
{ {
"use sendfile" = mkOptionDefault true; "use sendfile" = mkOptionDefault true;
"mdns name" = mkOptionDefault "mdns"; "mdns name" = mkOptionDefault "mdns";
@ -326,7 +327,7 @@ in {
] ]
++ mapAttrsToList (_: idmap: mapAttrs' (key: value: nameValuePair "idmap config ${idmap.domain} : ${key}" (mkOptionDefault value)) idmap.settings) cfg.idmap.domains); ++ mapAttrsToList (_: idmap: mapAttrs' (key: value: nameValuePair "idmap config ${idmap.domain} : ${key}" (mkOptionDefault value)) idmap.settings) cfg.idmap.domains);
extraConfig = mkMerge ( extraConfig = mkMerge (
mapAttrsToList (key: value: ''${key} = ${settingValue value}'') cfg.settings mapAttrsToList (key: value: ''${key} = ${settingValue value}'') cfg.settings'
++ [ ++ [
(mkIf (cfg.ldap.enable && cfg.ldap.passdb.enable) (mkBefore '' (mkIf (cfg.ldap.enable && cfg.ldap.passdb.enable) (mkBefore ''
passdb backend = ${cfg.ldap.passdb.backend}:"${cfg.ldap.url}" passdb backend = ${cfg.ldap.passdb.backend}:"${cfg.ldap.url}"

2
nixos/kyuuto/opl.nix
View file

@ -35,7 +35,7 @@ in {
config = { config = {
services.samba = { services.samba = {
settings = mkIf cfg.enable { settings' = mkIf cfg.enable {
"ntlm auth" = mkDefault "ntlmv1-permitted"; "ntlm auth" = mkDefault "ntlmv1-permitted";
"server min protocol" = mkDefault "NT1"; "server min protocol" = mkDefault "NT1";
"keepalive" = mkDefault 0; "keepalive" = mkDefault 0;

2
nixos/samba.nix
View file

@ -61,7 +61,7 @@ in {
passdb.smbpasswd.path = mkIf (!cfg.ldap.enable || !cfg.ldap.passdb.enable) ( passdb.smbpasswd.path = mkIf (!cfg.ldap.enable || !cfg.ldap.passdb.enable) (
mkDefault config.sops.secrets.smbpasswd.path mkDefault config.sops.secrets.smbpasswd.path
); );
settings = mkMerge [ settings' = mkMerge [
{ {
"local master" = true; "local master" = true;
"preferred master" = true; "preferred master" = true;