svn commit: samba r5191 - in branches/SAMBA_3_0/packaging: Fedora RedHat

[jerry at samba.org]

Author: jerry
Date: 2005-02-03 04:38:48 +0000 (Thu, 03 Feb 2005)
New Revision: 5191

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5191

Log:
BUG 2299: better logrotate configuration from Levente Farkas <lfarkas at lfarkas.org>
Modified:
   branches/SAMBA_3_0/packaging/Fedora/samba.log
   branches/SAMBA_3_0/packaging/Fedora/smb.conf
   branches/SAMBA_3_0/packaging/RedHat/samba.log
   branches/SAMBA_3_0/packaging/RedHat/smb.conf


Changeset:
Modified: branches/SAMBA_3_0/packaging/Fedora/samba.log
===================================================================
--- branches/SAMBA_3_0/packaging/Fedora/samba.log	2005-02-03 04:22:37 UTC (rev 5190)
+++ branches/SAMBA_3_0/packaging/Fedora/samba.log	2005-02-03 04:38:48 UTC (rev 5191)
@@ -1,4 +1,4 @@
-/var/log/samba/*.log {
+/var/log/samba/*.log /var/log/samba/log.smbd /var/log/samba/log.nmbd {
     notifempty
     missingok
     sharedscripts

Modified: branches/SAMBA_3_0/packaging/Fedora/smb.conf
===================================================================
--- branches/SAMBA_3_0/packaging/Fedora/smb.conf	2005-02-03 04:22:37 UTC (rev 5190)
+++ branches/SAMBA_3_0/packaging/Fedora/smb.conf	2005-02-03 04:38:48 UTC (rev 5191)
@@ -43,7 +43,7 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   #log file = /var/log/samba/log.%m
+   #log file = /var/log/samba/%m.log
 # all information in one file
    log file = /var/log/samba/log.smbd
 

Modified: branches/SAMBA_3_0/packaging/RedHat/samba.log
===================================================================
--- branches/SAMBA_3_0/packaging/RedHat/samba.log	2005-02-03 04:22:37 UTC (rev 5190)
+++ branches/SAMBA_3_0/packaging/RedHat/samba.log	2005-02-03 04:38:48 UTC (rev 5191)
@@ -1,11 +1,9 @@
-/var/log/samba/log.nmbd {
+/var/log/samba/*.log /var/log/samba/log.smbd /var/log/samba/log.nmbd {
+    notifempty
+    missingok
+    sharedscripts
+    copytruncate
     postrotate
-	/usr/bin/killall -HUP nmbd
+	/bin/kill -HUP `cat /var/run/smbd.pid /var/run/nmbd.pid /var/run/winbindd.pid 2> /dev/null` 2> /dev/null || true
     endscript
 }
-
-/var/log/samba/log.smbd {
-    postrotate
-	/usr/bin/killall -HUP smbd
-    endscript
-}

Modified: branches/SAMBA_3_0/packaging/RedHat/smb.conf
===================================================================
--- branches/SAMBA_3_0/packaging/RedHat/smb.conf	2005-02-03 04:22:37 UTC (rev 5190)
+++ branches/SAMBA_3_0/packaging/RedHat/smb.conf	2005-02-03 04:38:48 UTC (rev 5191)
@@ -43,7 +43,7 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   # log file = /var/log/samba/log.%m
+   # log file = /var/log/samba/%m.log
 # all log information in one file
    log file = /var/log/samba/smbd.log