Fixed some samba issue

svn path=/nixpkgs/trunk/; revision=9259

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

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 {

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