From c4b4b6b4b28bfdc78a7a753b4fa172ad7fc773a2 Mon Sep 17 00:00:00 2001 From: Daniel Jakots Date: Sat, 20 May 2017 22:45:07 -0400 Subject: [PATCH] WWWDIR may not exist and it's fine --- shellpki.sh | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/shellpki.sh b/shellpki.sh index 8427839..183704e 100755 --- a/shellpki.sh +++ b/shellpki.sh @@ -96,15 +96,17 @@ cp $DIR/$cn.key $DIR/$cn.pem cat $DIR/$cn.crt >> $DIR/$cn.pem # copy to public certs dir -echo -echo "copy cert to public certs dir" -echo -cp -i $DIR/$cn.crt $PREFIX/certs/ -cp -i $DIR/$cn.crt $WWWDIR/ -cp -i $DIR/$cn.key $WWWDIR/ -chown -R root:www $WWWDIR -chmod -R u=rwX,g=rwX,o= $WWWDIR -echo +if [ -d "$WWWDIR" ]; then + echo + echo "copy cert to public certs dir" + echo + cp -i $DIR/$cn.crt $PREFIX/certs/ + cp -i $DIR/$cn.crt $WWWDIR/ + cp -i $DIR/$cn.key $WWWDIR/ + chown -R root:www $WWWDIR + chmod -R u=rwX,g=rwX,o= $WWWDIR + echo +fi # generate client configuration @@ -149,9 +151,10 @@ $OPENSSL ca \ -revoke $PREFIX/certs/$cn.crt rm -i $PREFIX/certs/$cn.crt -rm -i $WWWDIR/$cn.crt -rm -i $WWWDIR/$cn.key - +if [ -d "$WWWDIR" ]; then + rm -i $WWWDIR/$cn.crt + rm -i $WWWDIR/$cn.key +fi } fromcsr() {