[cpp-sp COMMIT] in /branches/REL_2: configs/Makefile.am configs/shibd-amazon.in configs/shibd-redhat.in configs/shibd...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Feb 26 11:27:07 2015
New Revision: 3905

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3905&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-646

Modified:
    branches/REL_2/configs/Makefile.am
    branches/REL_2/configs/shibd-amazon.in
    branches/REL_2/configs/shibd-redhat.in
    branches/REL_2/configs/shibd-suse.in
    branches/REL_2/shibboleth.spec.in

Modified: branches/REL_2/configs/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/Makefile.am?rev=3905&r1=3904&r2=3905&view=diff
==============================================================================
--- branches/REL_2/configs/Makefile.am (original)
+++ branches/REL_2/configs/Makefile.am Thu Feb 26 11:27:07 2015
@@ -4,7 +4,7 @@
 
 pkglibdir = ${libdir}/@PACKAGE_NAME@
 pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@
-shirelogdir = ${localstatedir}/log/httpd
+shirelogdir = ${localstatedir}/log/@PACKAGE_NAME at -www
 pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
 pkgwebdir = $(datadir)/@PACKAGE_NAME@
 pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@

Modified: branches/REL_2/configs/shibd-amazon.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd-amazon.in?rev=3905&r1=3904&r2=3905&view=diff
==============================================================================
--- branches/REL_2/configs/shibd-amazon.in (original)
+++ branches/REL_2/configs/shibd-amazon.in Thu Feb 26 11:27:07 2015
@@ -55,6 +55,9 @@
 	# Handle transition from root to non-root packages.
 	chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ 2>/dev/null || :
 	daemon --user $SHIBD_USER $shibd -p $pidfile -f -w 30
+
+    # Adjust native logging directory permission so log roll-over works
+    chown apache:apache @-SHIRELOGDIR-@
 
 	RETVAL=$?
 	echo

Modified: branches/REL_2/configs/shibd-redhat.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd-redhat.in?rev=3905&r1=3904&r2=3905&view=diff
==============================================================================
--- branches/REL_2/configs/shibd-redhat.in (original)
+++ branches/REL_2/configs/shibd-redhat.in Thu Feb 26 11:27:07 2015
@@ -55,6 +55,9 @@
 	# Handle transition from root to non-root packages.
 	chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ 2>/dev/null || :
 	daemon --user $SHIBD_USER $shibd -p $pidfile -f -w 30
+
+    # Adjust native logging directory permission so log roll-over works
+    chown apache:apache @-SHIRELOGDIR-@
 
 	RETVAL=$?
 	echo

Modified: branches/REL_2/configs/shibd-suse.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd-suse.in?rev=3905&r1=3904&r2=3905&view=diff
==============================================================================
--- branches/REL_2/configs/shibd-suse.in (original)
+++ branches/REL_2/configs/shibd-suse.in Thu Feb 26 11:27:07 2015
@@ -56,6 +56,9 @@
 
         # Handle transition from root to non-root packages.
         chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ 2>/dev/null || :
+		
+        # Adjust native logging directory permission so log roll-over works
+        chown wwwrun:www @-SHIRELOGDIR-@
 		
         echo -n "Starting $DESC ($NAME)"
         ## Start daemon with startproc(8). If this fails

Modified: branches/REL_2/shibboleth.spec.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibboleth.spec.in?rev=3905&r1=3904&r2=3905&view=diff
==============================================================================
--- branches/REL_2/shibboleth.spec.in (original)
+++ branches/REL_2/shibboleth.spec.in Thu Feb 26 11:27:07 2015
@@ -314,6 +314,16 @@
 %dir %{_libdir}/shibboleth
 %{_libdir}/shibboleth/*
 %attr(0750,%{runuser},%{runuser}) %dir %{_localstatedir}/log/shibboleth
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon" || "%{_vendor}" == "suse"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
+%attr(0750,apache,apache) %dir %{_localstatedir}/log/shibboleth-www
+%endif
+%if "%{_vendor}" == "suse"
+%attr(0750,wwwrun,www) %dir %{_localstatedir}/log/shibboleth-www
+%endif
+%else
+%attr(0750,-,-) %dir %{_localstatedir}/log/shibboleth-www
+%endif
 %if 0%{?suse_version} < 1300
 %attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/run/shibboleth
 %endif
@@ -349,8 +359,9 @@
 %doc %{pkgdocdir}/api
 
 %changelog
-* Mon Jan 19 2015 Scott Cantor <cantor.2 at osu.edu> - 2.5.4-1
+* Wed Feb 25 2015 Scott Cantor <cantor.2 at osu.edu> - 2.5.4-1
 - Add Amazon VM support
+- Add a separate native logging directory
 
 * Mon Nov 17 2014 Scott Cantor <cantor.2 at osu.edu> - 2.5.3-2
 - Add libtool dep for OpenSUSE 13