update ssl_certs to copy dhparams.pem from the ssl_cert directory.

diff --git a/GenaSYS.sh b/GenaSYS.sh
index bcacebf..5230e7e 100755 (executable)
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -25,8 +25,8 @@
     PURPOSE_="Generate config files needed for Evergreen-ILS Cluster"
    SYNOPSIS_="$NAME_"
    REQUIRES_="standard GNU commands, apt, dpkg"
-    VERSION_="1.96"
-       DATE_="2010-11-23; last update: 2019-04-04"
+    VERSION_="1.97"
+       DATE_="2010-11-23; last update: 2019-04-08"
      AUTHOR_="Andy Witter <awitter@georgialibraries.org>"
         URL_="http://evergreen-ils.org"
    CATEGORY_="devel"
@@ -406,7 +406,7 @@ TitleBar "SSL Certificate Configuration"
 echo
 echo "An SSL Certificate is required for Evergreen to function correctly."
 echo "If you have purchased a certificate from a CA then please copy "
-echo "the certificate files (server.crt, server.key and ca.crt if applicable)"
+echo "the certificate files (server.crt, server.key and ca.crt, dhparams.pem if applicable)"
 echo -e "to"$COL_YELLOW ${WD}/ssl_cert $COL_RESET"now then press [y] to continue."
 echo "If you do not have a purchased certificate from a CA then press [n]"
 echo "and GenaSYS will generate a self-signed certificate automatically."
@@ -1671,6 +1671,7 @@ for LVS in $MACHINES_LVS_ONLY
        mkdir -p "$OUTDIR/$LVS/etc/apache2/ssl" && cp -f "${CERT_DIR}/server.key" "$OUTDIR/$LVS/etc/apache2/ssl"
        [ -e "${CERT_DIR}/ca.crt" ] && cp -f "${CERT_DIR}/ca.crt" "$OUTDIR/$LVS/etc/apache2/ssl"
         cp -f "${CERT_DIR}/server.crt" "$OUTDIR/$LVS/etc/apache2/ssl"
+       cp -f "${CERT_DIR}/dhparams.pem" "$OUTDIR/$LVS/etc/apache2/ssl"
 done
 
 
@@ -1920,6 +1921,7 @@ for BRICK in $(seq $BRICKCOUNT)
        fi
        eval cp -f $TEMPLATEDIR/eg_fstab_head ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc
        eval cp -f ${CERT_DIR}/server.* ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2/ssl
+       eval cp -f ${CERT_DIR}/dhparams.pem ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2/ssl
        
        [ -e "${CERT_DIR}/ca.crt" ] && eval cp -f "${CERT_DIR}/ca.crt" ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2/ssl
        [ -e "${CERT_DIR}/dhparams.pem" ] && eval cp -f "${CERT_DIR}/dhparams.pem" ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2/ssl
@@ -2641,6 +2643,7 @@ do
        
        mkdir -p "$OUTDIR/$OTHERNODE/etc/apache2/ssl" && cp -f "${CERT_DIR}/server.key" "$OUTDIR/$OTHERNODE/etc/apache2/ssl"
        cp -f "${CERT_DIR}/server.crt" "$OUTDIR/$OTHERNODE/etc/apache2/ssl"
+       cp -f "${CERT_DIR}/dhparams.pem" "$OUTDIR/$OTHERNODE/etc/apache2/ssl"
        [ -e "${CERT_DIR}/ca.crt" ] && cp -f "${CERT_DIR}/ca.crt" "$OUTDIR/$OTHERNODE/etc/apache2/ssl"
        [ -e "${CUSTOMDIR}/zips.txt" ] && cp -f "${CUSTOMDIR}/zips.txt"  "$OUTDIR/$OTHERNODE/openils/var/data/zips.txt"
        mkdir -p "$OUTDIR/$OTHERNODE/openils/conf" && cp -f "$TEMPLATEDIR/opensrf_core.xml" "$OUTDIR/${OTHERNODE}/openils/conf"