|
@@ -15,7 +15,7 @@ GEN_LOCKFILE="/tmp/dhparam_generating.lock"
|
|
|
PREGEN_HASH=$(md5sum $PREGEN_DHPARAM_FILE | cut -d" " -f1)
|
|
|
if [[ -f $DHPARAM_FILE ]]; then
|
|
|
CURRENT_HASH=$(md5sum $DHPARAM_FILE | cut -d" " -f1)
|
|
|
- if [[ $PREGEN_HASH != $CURRENT_HASH ]]; then
|
|
|
+ if [[ $PREGEN_HASH != "$CURRENT_HASH" ]]; then
|
|
|
|
|
|
echo "Custom dhparam.pem file found, generation skipped"
|
|
|
exit 0
|
|
@@ -44,10 +44,10 @@ touch $GEN_LOCKFILE
|
|
|
|
|
|
(
|
|
|
(
|
|
|
- nice -n +5 openssl dhparam -dsaparam -out $DHPARAM_FILE.tmp $DHPARAM_BITS 2>&1 \
|
|
|
+ nice -n +5 openssl dhparam -dsaparam -out $DHPARAM_FILE.tmp "$DHPARAM_BITS" 2>&1 \
|
|
|
&& mv $DHPARAM_FILE.tmp $DHPARAM_FILE \
|
|
|
&& echo "dhparam generation complete, reloading nginx" \
|
|
|
&& nginx -s reload
|
|
|
) | grep -vE '^[\.+]+'
|
|
|
rm $GEN_LOCKFILE
|
|
|
-) &disown
|
|
|
+) & disown
|