- removed duplicate logrotate config

diff --git a/samba.logrotate b/samba.logrotate
index 64efd554ad9d174f68722ec95602b11648b52599..199317d1bc5f8417ea0cc4fdc061455c89c1d293 100644 (file)
--- a/samba.logrotate
+++ b/samba.logrotate
@@ -4,6 +4,7 @@
        missingok
        olddir /var/log/archive/samba
        postrotate
-               /bin/killall -HUP samba
+               /sbin/service smb reload >/dev/null || :
+               /sbin/service samba reload >/dev/null || :
        endscript
 }

diff --git a/samba3.logrotate b/samba3.logrotate
deleted file mode 100644 (file)
index 2f83b39..0000000
--- a/samba3.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/samba/log.* {
-       sharedscripts
-       notifempty
-       missingok
-       olddir /var/log/archive/samba
-       postrotate
-               /bin/killall -HUP nmbd smbd
-       endscript
-}

diff --git a/samba4.spec b/samba4.spec
index 748740a0bb01d6878ed37411ab391d341410af26..8892864b4f83bf237b10344a04ff373501472556 100644 (file)
--- a/samba4.spec
+++ b/samba4.spec
@@ -37,7 +37,6 @@ 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
 Patch4:                samba-lprng-no-dot-printers.patch
@@ -569,7 +568,6 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/samba
 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
@@ -803,7 +801,6 @@ fi
 
 #%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
 %attr(755,root,root) %{_bindir}/dbwrap_tool