From 027fe985504162560171cd2ea89d704d8b6ebca6 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Mon, 9 Mar 2015 14:09:35 +0000 Subject: [PATCH] Don't need chown of new log dir, clean up some indents --- configs/shibd-amazon.in | 5 +---- configs/shibd-redhat.in | 3 --- configs/shibd-suse.in | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configs/shibd-amazon.in b/configs/shibd-amazon.in index 2bb42f8..3e4c477 100644 --- a/configs/shibd-amazon.in +++ b/configs/shibd-amazon.in @@ -53,12 +53,9 @@ start() { chown $SHIBD_USER:$SHIBD_USER $pidfile # Handle transition from root to non-root packages. - chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ @-PKGCACHEDIR-@ 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 - chown apache:apache @-SHIRELOGDIR-@ - RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/configs/shibd-redhat.in b/configs/shibd-redhat.in index 90c4e4f..3e4c477 100644 --- a/configs/shibd-redhat.in +++ b/configs/shibd-redhat.in @@ -56,9 +56,6 @@ start() { 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 - chown apache:apache @-SHIRELOGDIR-@ - RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/configs/shibd-suse.in b/configs/shibd-suse.in index 4770ff1..318499f 100644 --- a/configs/shibd-suse.in +++ b/configs/shibd-suse.in @@ -57,9 +57,6 @@ case "$1" in # Handle transition from root to non-root packages. 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-@ - echo -n "Starting $DESC ($NAME)" ## Start daemon with startproc(8). If this fails ## the echo return value is set appropriate. -- 2.1.4