[packages/samba/DEVEL: 62/111] - fix logrotate script for samba4 and add one for samba3 - rel 2

baggins baggins at pld-linux.org
Wed Jan 15 19:43:37 CET 2014


commit f5211db761fa059058652e587e19635f0ca96f63
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Aug 26 11:30:21 2013 +0200

    - fix logrotate script for samba4 and add one for samba3
    - rel 2

 samba.logrotate  | 2 +-
 samba3.logrotate | 9 +++++++++
 samba4.spec      | 5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index 06ca9b6..2c42de4 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -18,7 +18,7 @@ Summary:	Active Directory server
 Summary(pl.UTF-8):	Serwer Active Directory
 Name:		samba4
 Version:	4.0.9
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v3
 Group:		Networking/Daemons
@@ -35,6 +35,7 @@ Source8:	winbind.sysconfig
 Source9:	samba.init
 Source10:	https://github.com/downloads/fumiyas/samba-virusfilter/samba-virusfilter-%{virusfilter_version}.tar.bz2
 # Source10-md5:	a3a30d5fbf309d356e8c5833db680c17
+Source11:	samba3.logrotate
 Patch0:		system-heimdal.patch
 Patch1:		samba-c++-nofail.patch
 Patch3:		samba-nscd.patch
@@ -838,6 +839,7 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/samba
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/swat
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/samba
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/samba
+cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/samba3
 cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
 install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/winbind
 cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/winbind
@@ -1552,6 +1554,7 @@ fi
 %defattr(644,root,root,755)
 %attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smb.conf
 %attr(754,root,root) /etc/rc.d/init.d/smb
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/samba3
 %{systemdunitdir}/nmb.service
 %{systemdunitdir}/smb.service
 
diff --git a/samba.logrotate b/samba.logrotate
index 2f83b39..64efd55 100644
--- a/samba.logrotate
+++ b/samba.logrotate
@@ -4,6 +4,6 @@
 	missingok
 	olddir /var/log/archive/samba
 	postrotate
-		/bin/killall -HUP nmbd smbd
+		/bin/killall -HUP samba
 	endscript
 }
diff --git a/samba3.logrotate b/samba3.logrotate
new file mode 100644
index 0000000..2f83b39
--- /dev/null
+++ b/samba3.logrotate
@@ -0,0 +1,9 @@
+/var/log/samba/log.* {
+	sharedscripts
+	notifempty
+	missingok
+	olddir /var/log/archive/samba
+	postrotate
+		/bin/killall -HUP nmbd smbd
+	endscript
+}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/samba.git/commitdiff/8f2607b83208e9672972be90df9adb474f035876



More information about the pld-cvs-commit mailing list