From d73e8b904fb60e35e69ed3d3de464639450bfa67 Mon Sep 17 00:00:00 2001
From: Asif Bacchus <asif@programming.virtual.bacchus.network>
Date: Sat, 5 Jan 2019 04:45:02 -0700
Subject: [PATCH] updated subst for master SSL settings file

---
 .vscode/numbered-bookmarks.json | 2 +-
 setup.sh                        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.vscode/numbered-bookmarks.json b/.vscode/numbered-bookmarks.json
index fff2b18..ce68d22 100644
--- a/.vscode/numbered-bookmarks.json
+++ b/.vscode/numbered-bookmarks.json
@@ -12,7 +12,7 @@
 				-1,
 				-1,
 				-1,
-				532
+				537
 			]
 		}
 	]
diff --git a/setup.sh b/setup.sh
index a2b3a94..ced7189 100644
--- a/setup.sh
+++ b/setup.sh
@@ -45,7 +45,7 @@ tag_sslkey="<path/to/your_certificate_private_key.key>"
 file_ssl="nginx/snippets/ssl/ssl_certs.conf"
 tag_dhparam="<path/to/your_dhparam.pem>"
 tag_cachain="<path/to/your_CA_bundle.crt>"
-
+file_mozmodern="nginx/conf.d/mozModern_ssl.conf"
 
 ### quick intro for the user
 echo -e "\n${mag}This script will customize the provided NGINX template files for your"
@@ -536,9 +536,9 @@ sed -i -e "s%${tag_sslcert}%${CertPath}%" "${configPath}/${file_ssl}"
 sed -i -e "s%${tag_sslkey}%${KeyPath}%" "${configPath}/${file_ssl}"
 
 # process mozModern SSL configuration
-echo "updating SSL configuration parameters file"
-echo -e "s%${tag_dhparam}%${DHPath}%" "${configPath}/nginx/conf.d/mozModern_ssl.conf"
-echo -e "s%${tag_cachain}%${CAChainPath}%" "${configPath}/nginx/conf.d/mozModern_ssl.conf"
+echo "updating ${warn}${configPath}/${file_mozmodern}${norm}"
+echo -i -e "s%${tag_dhparam}%${DHPath}%" "${configPath}/${file_mozmodern}"
+echo -i -e "s%${tag_cachain}%${CAChainPath}%" "${configPath}/${file_mozmodern}"