pkglibdir = ${libdir}/@PACKAGE_NAME@
pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@
-shirelogdir = ${localstatedir}/log/httpd
+shirelogdir = ${localstatedir}/log/@PACKAGE_NAME@-www
pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
pkgwebdir = $(datadir)/@PACKAGE_NAME@
pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@
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
[ $RETVAL -eq 0 ] && touch $lockfile
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
[ $RETVAL -eq 0 ] && touch $lockfile
# 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
## the echo return value is set appropriate.
%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
%doc %{pkgdocdir}/api
%changelog
-* Mon Jan 19 2015 Scott Cantor <cantor.2@osu.edu> - 2.5.4-1
+* Wed Feb 25 2015 Scott Cantor <cantor.2@osu.edu> - 2.5.4-1
- Add Amazon VM support
+- Add a separate native logging directory
* Mon Nov 17 2014 Scott Cantor <cantor.2@osu.edu> - 2.5.3-2
- Add libtool dep for OpenSUSE 13