[csw-devel] SF.net SVN: gar:[16679] csw/mgar/pkg/samba/trunk

[dmichelsen at users.sourceforge.net]

Revision: 16679
          http://gar.svn.sourceforge.net/gar/?rev=16679&view=rev
Author:   dmichelsen
Date:     2012-01-04 15:28:23 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
samba/trunk: Adjust log directory location

Modified Paths:
--------------
    csw/mgar/pkg/samba/trunk/Makefile
    csw/mgar/pkg/samba/trunk/files/smb.conf

Modified: csw/mgar/pkg/samba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/samba/trunk/Makefile	2012-01-04 14:59:13 UTC (rev 16678)
+++ csw/mgar/pkg/samba/trunk/Makefile	2012-01-04 15:28:23 UTC (rev 16679)
@@ -15,6 +15,7 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += cswsamba
 EXPANDVARS += cswsamba
+EXPANDVARS += smb.conf
 
 # From http://www.reallylinux.com/docs/smb.conf
 DISTFILES += smb.conf
@@ -278,19 +279,24 @@
 ISAEXEC = 1
 
 SMBLOCKDIR = $(localstatedir)/samba/locks
+SMBLOGDIR = $(localstatedir)/samba/log
+SMBPRIVATEDIR = $(sysconfdir)/samba/private
+SMBCONFIGDIR = $(sysconfdir)/samba
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/source3/configure
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --enable-socket-wrapper
 CONFIGURE_ARGS += --enable-nss-wrapper
-CONFIGURE_ARGS += --with-privatedir=$(sysconfdir)/samba/private
-CONFIGURE_ARGS += --with-configdir=$(sysconfdir)/samba
+CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR)
+CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR)
 
 CONFIGURE_ARGS += --with-lockdir=$(SMBLOCKDIR)
 CONFIGURE_ARGS += --with-statedir=$(SMBLOCKDIR)
 CONFIGURE_ARGS += --with-cachedir=$(SMBLOCKDIR)
 CONFIGURE_ARGS += --with-piddir=$(SMBLOCKDIR)
 
+CONFIGURE_ARGS += --with-logfilebase=$(SMBLOGDIR)
+
 CONFIGURE_ARGS-64 +=  --disable-cups
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
 

Modified: csw/mgar/pkg/samba/trunk/files/smb.conf
===================================================================
--- csw/mgar/pkg/samba/trunk/files/smb.conf	2012-01-04 14:59:13 UTC (rev 16678)
+++ csw/mgar/pkg/samba/trunk/files/smb.conf	2012-01-04 15:28:23 UTC (rev 16679)
@@ -43,9 +43,9 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-	log file = /var/log/samba/%m.log
+	log file = @SMBLOGDIR@/%m.log
 # all log information in one file
-#   log file = /var/log/samba/smbd.log
+#   log file = @SMBLOGDIR@/smbd.log
 
 # Put a capping on the size of the log files (in Kb).
 	max log size = 50
@@ -64,7 +64,7 @@
 # ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
 # Do not enable this option unless you have read those documents
 ;  encrypt passwords = yes
-;  smb passwd file = /etc/opt/csw/samba/smbpasswd
+;  smb passwd file = @SMBCONFIGDIF@/smbpasswd
 
 # The following are needed to allow password changing from Windows to
 # update the Linux system password also.
@@ -77,12 +77,12 @@
 ;  passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n *passwd:*all*authentication*tokens*updated*successfully*
 
 # Unix users can map to different SMB User names
-;  username map = /etc/opt/csw/samba/smbusers
+;  username map = @SMBCONFIGDIR@/smbusers
 
 # Using the following line enables you to customise your configuration
 # on a per machine basis. The %m gets replaced with the netbios name
 # of the machine that is connecting
-;   include = /etc/opt/csw/samba/smb.conf.%m
+;   include = @SMBCONFIGDIR@/smb.conf.%m
 
 # Most people will find that this option gives better performance.
 # See speed.txt and the manual pages for details
@@ -178,7 +178,7 @@
 	idmap uid = 16777216-33554431
 	idmap gid = 16777216-33554431
 	template shell = /bin/false
-	username map = /etc/opt/csw/samba/smbusers
+	username map = @SMBCONFIGDIR@/smbusers
 	winbind use default domain = no
 [homes]
 	comment = Home Directories

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.