JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/samba: add services.samba.configText option

Browse Source 
The .configText option is for providing verbatim content of smb.conf.

I'm adding this because I cannot seem to find any other way to override
(with mkForce) the generated smb.conf with the current samba module. All
attempts ends with errors ("duplicate entry samba/smb.conf").
This commit is contained in:
Bjørn Forsman 2014-09-06 23:37:57 +02:00
parent 753d9d4e4f
commit 3ebe3df4d0
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/network-filesystems/samba.nix
View File

@ -28,6 +28,7 @@ let
''; '';
configFile = pkgs.writeText "smb.conf" configFile = pkgs.writeText "smb.conf"
(if cfg.configText != null then cfg.configText else
'' ''
[ global ] [ global ]
log file = ${logDir}/log.%m log file = ${logDir}/log.%m
@ -35,7 +36,7 @@ let
${optionalString cfg.syncPasswordsByPam "pam password change = true"} ${optionalString cfg.syncPasswordsByPam "pam password change = true"}
${cfg.extraConfig} ${cfg.extraConfig}
''; '');
# This may include nss_ldap, needed for samba if it has to use ldap. # This may include nss_ldap, needed for samba if it has to use ldap.
nssModulesPath = config.system.nssModules.path; nssModulesPath = config.system.nssModules.path;
@ -133,6 +134,15 @@ in
"; ";
}; };
configText = mkOption {
type = types.nullOr types.lines;
default = null;
description = "
Verbatim contents of smb.conf. If null (default), use the
autogenerated file from NixOS instead.
";
};
securityType = mkOption { securityType = mkOption {
description = "Samba security type"; description = "Samba security type";
default = "user"; default = "user";