r5191: BUG 2299: better logrotate configuration from Levente Farkas <lfarkas@lfarkas...

diff --git a/packaging/Fedora/samba.log b/packaging/Fedora/samba.log
index 04106239fb12b7764bd816cd03a8e6befc61bea6..a3c000ea788d4f888c68b200a72200aa1ac59526 100644 (file)
--- a/packaging/Fedora/samba.log
+++ b/packaging/Fedora/samba.log
@@ -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

diff --git a/packaging/Fedora/smb.conf b/packaging/Fedora/smb.conf
index 5c06c445b314d2afb9c1e63cc42ed250ec3d54f5..133e442b1e78d0ea34a1ea07190b7fc75e6c13bf 100644 (file)
--- a/packaging/Fedora/smb.conf
+++ b/packaging/Fedora/smb.conf
@@ -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
 

diff --git a/packaging/RedHat/samba.log b/packaging/RedHat/samba.log
index 4b244099c4f58dacb9828ddf4a53ffacf9ff2770..a3c000ea788d4f888c68b200a72200aa1ac59526 100644 (file)
--- a/packaging/RedHat/samba.log
+++ b/packaging/RedHat/samba.log
@@ -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
-    endscript
-}
-
-/var/log/samba/log.smbd {
-    postrotate
-       /usr/bin/killall -HUP smbd
+       /bin/kill -HUP `cat /var/run/smbd.pid /var/run/nmbd.pid /var/run/winbindd.pid 2> /dev/null` 2> /dev/null || true
     endscript
 }

diff --git a/packaging/RedHat/smb.conf b/packaging/RedHat/smb.conf
index cdc958bc0e00d662bfed962e8d860c7ec723675e..b1404dfade628f0d82916243ffedb28593aa9d4d 100644 (file)
--- a/packaging/RedHat/smb.conf
+++ b/packaging/RedHat/smb.conf
@@ -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