diff options
| author | Wouter den Breejen <uu@denbreejen.net> | 2007-09-05 16:45:51 +0000 |
|---|---|---|
| committer | Wouter den Breejen <uu@denbreejen.net> | 2007-09-05 16:45:51 +0000 |
| commit | 4b04ed1b84ff6a497028a5824dc9ce7a4a85ea93 (patch) | |
| tree | 97a926ab589bd9531622952902bbca146de043f2 /pkgs/servers/samba | |
| parent | 5b220fb397f92311b3dab78e70307c57a693f08b (diff) | |
| download | nixpkgs-4b04ed1b84ff6a497028a5824dc9ce7a4a85ea93.tar nixpkgs-4b04ed1b84ff6a497028a5824dc9ce7a4a85ea93.tar.gz nixpkgs-4b04ed1b84ff6a497028a5824dc9ce7a4a85ea93.tar.bz2 nixpkgs-4b04ed1b84ff6a497028a5824dc9ce7a4a85ea93.tar.lz nixpkgs-4b04ed1b84ff6a497028a5824dc9ce7a4a85ea93.tar.xz nixpkgs-4b04ed1b84ff6a497028a5824dc9ce7a4a85ea93.tar.zst nixpkgs-4b04ed1b84ff6a497028a5824dc9ce7a4a85ea93.zip | |
Fixed some samba issue
svn path=/nixpkgs/trunk/; revision=9259
Diffstat (limited to 'pkgs/servers/samba')
| -rwxr-xr-x | pkgs/servers/samba/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/servers/samba/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/samba/smb.conf | 15 |
3 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/servers/samba/builder.sh b/pkgs/servers/samba/builder.sh index b5928cb5d4a..1cb991c6500 100755 --- a/pkgs/servers/samba/builder.sh +++ b/pkgs/servers/samba/builder.sh @@ -46,3 +46,5 @@ make install cp -f $smbconf $stateDir/config/smb.conf +ensureDir $stateDir/sambalog/ +touch $stateDir/sambalog/log.smbd diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index d64df0a884f..e91af3fbc24 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -5,7 +5,7 @@ , cups ? false , iprint ? false , activeDirectory ? false -, stateDir ? "/tmp/sambastate/" # (builtins.getEnv "HOME") + "/sambastate/" +, stateDir ? "/var/samba" # (builtins.getEnv "HOME") + "/sambastate/" } : stdenv.mkDerivation { diff --git a/pkgs/servers/samba/smb.conf b/pkgs/servers/samba/smb.conf index 92e052471d6..cbb2b7b3186 100644 --- a/pkgs/servers/samba/smb.conf +++ b/pkgs/servers/samba/smb.conf @@ -63,7 +63,7 @@ # this tells Samba to use a separate log file for each machine # that connects - log file = /tmp/sambalog/log.%m + log file = /var/samba/sambalog/log.%m # Put a capping on the size of the log files (in Kb). max log size = 50 @@ -82,7 +82,7 @@ # Backend to store user information in. New installations should # use either tdbsam or ldapsam. smbpasswd is available for backwards # compatibility. tdbsam requires no further configuration. - passdb backend = tdbsam:/home/wouterdb/sambastate/passdb.tdb + passdb backend = tdbsam:/var/samba/passdb.tdb # Using the following line enables you to customise your configuration # on a per machine basis. The %m gets replaced with the netbios name @@ -272,7 +272,7 @@ comment = NixOS Share Windows browseable = yes read only = Yes - path = /media/windowsdata + path = /media/windowsdata/WData valid users = wouterdb guest ok = yes printable = no @@ -284,5 +284,12 @@ path = /tmp read only = no - +[share] + comment = NixOS Share + browseable = yes + read only = Yes + path = /home/share + valid users = wouterdb + guest ok = yes + printable = no |