nixos/samba: update module to use tmpfiles, remove samba-setup service
This commit is contained in:
parent
3928e7f6b1
commit
18f9cfa1c0
|
@ -12,11 +12,6 @@ let
|
||||||
|
|
||||||
samba = cfg.package;
|
samba = cfg.package;
|
||||||
|
|
||||||
setupScript =
|
|
||||||
''
|
|
||||||
mkdir -p /var/lock/samba /var/log/samba /var/cache/samba /var/lib/samba/private
|
|
||||||
'';
|
|
||||||
|
|
||||||
shareConfig = name:
|
shareConfig = name:
|
||||||
let share = getAttr name cfg.shares; in
|
let share = getAttr name cfg.shares; in
|
||||||
"[${name}]\n " + (smbToString (
|
"[${name}]\n " + (smbToString (
|
||||||
|
@ -62,6 +57,7 @@ let
|
||||||
Type = "notify";
|
Type = "notify";
|
||||||
NotifyAccess = "all"; #may not do anything...
|
NotifyAccess = "all"; #may not do anything...
|
||||||
};
|
};
|
||||||
|
unitConfig.RequiresMountsFor = "/var/lib/samba";
|
||||||
|
|
||||||
restartTriggers = [ configFile ];
|
restartTriggers = [ configFile ];
|
||||||
};
|
};
|
||||||
|
@ -228,8 +224,7 @@ in
|
||||||
systemd = {
|
systemd = {
|
||||||
targets.samba = {
|
targets.samba = {
|
||||||
description = "Samba Server";
|
description = "Samba Server";
|
||||||
requires = [ "samba-setup.service" ];
|
after = [ "network.target" ];
|
||||||
after = [ "samba-setup.service" "network.target" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
};
|
};
|
||||||
# Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd
|
# Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd
|
||||||
|
@ -238,12 +233,13 @@ in
|
||||||
samba-smbd = daemonService "smbd" "";
|
samba-smbd = daemonService "smbd" "";
|
||||||
samba-nmbd = mkIf cfg.enableNmbd (daemonService "nmbd" "");
|
samba-nmbd = mkIf cfg.enableNmbd (daemonService "nmbd" "");
|
||||||
samba-winbindd = mkIf cfg.enableWinbindd (daemonService "winbindd" "");
|
samba-winbindd = mkIf cfg.enableWinbindd (daemonService "winbindd" "");
|
||||||
samba-setup = {
|
|
||||||
description = "Samba Setup Task";
|
|
||||||
script = setupScript;
|
|
||||||
unitConfig.RequiresMountsFor = "/var/lib/samba";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
tmpfiles.rules = [
|
||||||
|
"d /var/lock/samba - - - - -"
|
||||||
|
"d /var/log/samba - - - - -"
|
||||||
|
"d /var/cache/samba - - - - -"
|
||||||
|
"d /var/lib/samba/private - - - - -"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
security.pam.services.samba = {};
|
security.pam.services.samba = {};
|
||||||
|
|
Loading…
Reference in a new issue