diff options
| author | Gerald Carter <jerry@samba.org> | 2005-02-03 04:38:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:55:32 -0500 |
| commit | 49a992c45458a2af142e30ed6d5573f9db412e1d (patch) | |
| tree | 98c1c487e1c44de98837ba4b1b288ce45d5c438e | |
| parent | 91ef89daa03551fa17ff78adb9f36420057948da (diff) | |
| download | samba-49a992c45458a2af142e30ed6d5573f9db412e1d.tar.gz samba-49a992c45458a2af142e30ed6d5573f9db412e1d.tar.bz2 samba-49a992c45458a2af142e30ed6d5573f9db412e1d.zip | |
r5191: BUG 2299: better logrotate configuration from Levente Farkas <lfarkas@lfarkas.org>
(This used to be commit d9d56348213a735b7c56123bbd4126184ee116fa)
| -rw-r--r-- | packaging/Fedora/samba.log | 2 | ||||
| -rw-r--r-- | packaging/Fedora/smb.conf | 2 | ||||
| -rw-r--r-- | packaging/RedHat/samba.log | 14 | ||||
| -rw-r--r-- | packaging/RedHat/smb.conf | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/packaging/Fedora/samba.log b/packaging/Fedora/samba.log index 04106239fb..a3c000ea78 100644 --- 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 5c06c445b3..133e442b1e 100644 --- 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 4b244099c4..a3c000ea78 100644 --- 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 cdc958bc0e..b1404dfade 100644 --- 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 |