mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Fixing the samba daemons. "smbd -i", as we were using, handles *one request* and exit.
When it was working more or less, it was through upstart respawn. svn path=/nixos/trunk/; revision=27140
This commit is contained in:
parent
dc111c7425
commit
c4fe98706b
1 changed files with 6 additions and 5 deletions
|
@ -72,7 +72,10 @@ let
|
||||||
environment = {
|
environment = {
|
||||||
LD_LIBRARY_PATH = nssModulesPath;
|
LD_LIBRARY_PATH = nssModulesPath;
|
||||||
TZ = config.time.timeZone;
|
TZ = config.time.timeZone;
|
||||||
|
LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
daemonType = "fork";
|
||||||
|
|
||||||
exec = "${samba}/sbin/${appName} ${args}";
|
exec = "${samba}/sbin/${appName} ${args}";
|
||||||
};
|
};
|
||||||
|
@ -210,13 +213,11 @@ in
|
||||||
preStart = setupScript;
|
preStart = setupScript;
|
||||||
};
|
};
|
||||||
|
|
||||||
# nmbd says "standard input is not a socket, assuming -D option",
|
jobs.nmbd = daemonJob "nmbd" "-D";
|
||||||
# but using -i makes it stay in foreground (?)
|
|
||||||
jobs.nmbd = daemonJob "nmbd" " -i -F";
|
|
||||||
|
|
||||||
jobs.smbd = daemonJob "smbd" " -i -F";
|
jobs.smbd = daemonJob "smbd" "-D";
|
||||||
|
|
||||||
jobs.winbindd = daemonJob "winbindd" " -F";
|
jobs.winbindd = daemonJob "winbindd" "-D";
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue