From ad64936f0c5cda33143275fe70487cef077cc830 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Wed, 4 Mar 2015 02:50:55 +0000 Subject: [PATCH] https://issues.shibboleth.net/jira/browse/SSPCPP-645 --- configs/Makefile.am | 3 ++- configs/shibd-amazon.in | 2 +- configs/shibd-redhat.in | 2 +- configs/shibd-suse.in | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/Makefile.am b/configs/Makefile.am index 551908e..810057c 100644 --- a/configs/Makefile.am +++ b/configs/Makefile.am @@ -69,7 +69,8 @@ do-build-file: -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 diff --git a/configs/shibd-amazon.in b/configs/shibd-amazon.in index 1668333..2bb42f8 100644 --- a/configs/shibd-amazon.in +++ b/configs/shibd-amazon.in @@ -53,7 +53,7 @@ start() { 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 diff --git a/configs/shibd-redhat.in b/configs/shibd-redhat.in index 1668333..90c4e4f 100644 --- a/configs/shibd-redhat.in +++ b/configs/shibd-redhat.in @@ -53,7 +53,7 @@ start() { 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 diff --git a/configs/shibd-suse.in b/configs/shibd-suse.in index 8751a41..4770ff1 100644 --- a/configs/shibd-suse.in +++ b/configs/shibd-suse.in @@ -55,7 +55,7 @@ case "$1" in [ -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-@ -- 2.1.4