samba4/sambaMaster: Modify services to align with Samba project usage

Changed files
+8 -5
nixos
modules
services
network-filesystems
+8 -5
nixos/modules/services/network-filesystems/samba.nix
···
};
serviceConfig = {
-
ExecStart = "${samba}/sbin/${appName} ${args}";
+
ExecStart = "${samba}/sbin/${appName} --foreground --no-process-group ${args}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
LimitNOFILE = 16384;
+
PIDFile = "/run/${appName}.pid";
Type = "notify";
+
NotifyAccess = "all"; #may not do anything...
};
restartTriggers = [ configFile ];
···
after = [ "samba-setup.service" "network.target" ];
wantedBy = [ "multi-user.target" ];
};
-
+
# Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd
+
# for correct use with systemd
services = {
-
"samba-smbd" = daemonService "smbd" "-F";
-
"samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "-F");
-
"samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "-F");
+
"samba-smbd" = daemonService "smbd" "";
+
"samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "");
+
"samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "");
"samba-setup" = {
description = "Samba Setup Task";
script = setupScript;