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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar  3 21:50:55 2015
New Revision: 3907

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

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

Modified: branches/REL_2/configs/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/Makefile.am?rev=3907&r1=3906&r2=3907&view=diff
==============================================================================
--- branches/REL_2/configs/Makefile.am (original)
+++ branches/REL_2/configs/Makefile.am Tue Mar  3 21:50:55 2015
@@ -69,7 +69,8 @@
 		-e 's:@-PKGWEBDIR-@:${pkgwebdir}:g' \
 		-e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
 		-e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
-		-e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
+		-e 's:@-PKGRUNDIR-@:${pkgrundir}:g' \
+		-e 's:@-PKGCACHEDIR-@:${pkgcachedir}:g'
 	cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
 	rm -f ${FILE}.tmp
 

Modified: branches/REL_2/configs/shibd-amazon.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd-amazon.in?rev=3907&r1=3906&r2=3907&view=diff
==============================================================================
--- branches/REL_2/configs/shibd-amazon.in (original)
+++ branches/REL_2/configs/shibd-amazon.in Tue Mar  3 21:50:55 2015
@@ -53,7 +53,7 @@
 	chown $SHIBD_USER:$SHIBD_USER $pidfile
 
 	# Handle transition from root to non-root packages.
-	chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ 2>/dev/null || :
+    chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ @-PKGCACHEDIR-@ 2>/dev/null || :
 	daemon --user $SHIBD_USER $shibd -p $pidfile -f -w 30
 
     # Adjust native logging directory permission so log roll-over works

Modified: branches/REL_2/configs/shibd-redhat.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd-redhat.in?rev=3907&r1=3906&r2=3907&view=diff
==============================================================================
--- branches/REL_2/configs/shibd-redhat.in (original)
+++ branches/REL_2/configs/shibd-redhat.in Tue Mar  3 21:50:55 2015
@@ -53,7 +53,7 @@
 	chown $SHIBD_USER:$SHIBD_USER $pidfile
 
 	# Handle transition from root to non-root packages.
-	chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ 2>/dev/null || :
+	chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ @-PKGCACHEDIR-@ 2>/dev/null || :
 	daemon --user $SHIBD_USER $shibd -p $pidfile -f -w 30
 
     # Adjust native logging directory permission so log roll-over works

Modified: branches/REL_2/configs/shibd-suse.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd-suse.in?rev=3907&r1=3906&r2=3907&view=diff
==============================================================================
--- branches/REL_2/configs/shibd-suse.in (original)
+++ branches/REL_2/configs/shibd-suse.in Tue Mar  3 21:50:55 2015
@@ -55,7 +55,7 @@
         [ -d @-PKGRUNDIR-@ ] || mkdir @-PKGRUNDIR-@
 
         # Handle transition from root to non-root packages.
-        chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ 2>/dev/null || :
+        chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ @-PKGCACHEDIR-@ 2>/dev/null || :
 		
         # Adjust native logging directory permission so log roll-over works
         chown wwwrun:www @-SHIRELOGDIR-@