Merge pull request #69 from ellert/logrotate-su

Add su option to logrotate file
gridcf · Feb 18, 2019 · a28a0af · a28a0af
2 parents 76cc006 + 67aed6e
commit a28a0af
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/gram/jobmanager/source/configure.ac b/gram/jobmanager/source/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.60])
 
-AC_INIT([globus_gram_job_manager],[15.3],[https://github.com/gridcf/gct/issues])
+AC_INIT([globus_gram_job_manager],[15.4],[https://github.com/gridcf/gct/issues])
 AC_CONFIG_MACRO_DIR([m4])
 AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}])
 AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}])

diff --git a/gram/jobmanager/source/gram.logrotate.in b/gram/jobmanager/source/gram.logrotate.in
@@ -8,4 +8,5 @@
     rotate 4
     sharedscripts
     copytruncate
+    su root root
 }
diff --git a/packaging/debian/globus-gram-job-manager/debian/changelog.in b/packaging/debian/globus-gram-job-manager/debian/changelog.in
@@ -1,3 +1,9 @@
+globus-gram-job-manager (15.4-1+gct.@distro@) @distro@; urgency=medium
+
+  * Add su option to logrotate file
+
+ -- Mattias Ellert <[email protected]>  Fri, 15 Feb 2019 16:11:09 +0100
+
 globus-gram-job-manager (15.3-1+gct.@distro@) @distro@; urgency=medium
 
   * Remove usage statistics collection support

diff --git a/packaging/fedora/globus-gram-job-manager.spec b/packaging/fedora/globus-gram-job-manager.spec
@@ -2,7 +2,7 @@
 
 Name:		globus-gram-job-manager
 %global _name %(tr - _ <<< %{name})
-Version:	15.3
+Version:	15.4
 Release:	1%{?dist}
 Summary:	Grid Community Toolkit - GRAM Jobmanager
 
@@ -115,6 +115,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # Remove libtool archives (.la files)
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
+%if %{?rhel}%{!?rhel:0} == 6
+# Remove su option from logrotate file in EPEL 6 (not supported)
+sed '/ su /d' -i $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/globus-job-manager
+%endif
+
 %check
 GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1
 
@@ -153,6 +158,9 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1
 %{_libdir}/libglobus_seg_job_manager.so
 
 %changelog
+* Fri Feb 15 2019 Mattias Ellert <[email protected]> - 15.4-1
+- Add su option to logrotate file
+
 * Fri Dec 07 2018 Mattias Ellert <[email protected]> - 15.3-1
 - Remove usage statistics collection support