diff --git a/.vscode/numbered-bookmarks.json b/.vscode/numbered-bookmarks.json index aeba5b6..6c14f60 100644 --- a/.vscode/numbered-bookmarks.json +++ b/.vscode/numbered-bookmarks.json @@ -6,13 +6,13 @@ -1, 30, 44, - 690, + 694, -1, -1, -1, -1, -1, - 682 + 686 ] } ] diff --git a/setup.sh b/setup.sh index 1c57baa..56213ec 100755 --- a/setup.sh +++ b/setup.sh @@ -644,15 +644,19 @@ for name in "${serverNames[@]}"; do done sed -i "/${tag_servernames}/d" "${configPath}/${file_servernames}" -# process SSL snippet -echo -e "updating ${warn}${configPath}/${file_ssl}${norm}" -sed -i -e "s%${tag_sslcert}%${CertPath}%" "${configPath}/${file_ssl}" -sed -i -e "s%${tag_sslkey}%${KeyPath}%" "${configPath}/${file_ssl}" +# process SSL snippet if using SSL +if [ "${useSSL}" -eq 1 ]; then + echo -e "updating ${warn}${configPath}/${file_ssl}${norm}" + sed -i -e "s%${tag_sslcert}%${CertPath}%" "${configPath}/${file_ssl}" + sed -i -e "s%${tag_sslkey}%${KeyPath}%" "${configPath}/${file_ssl}" +fi -# process mozModern SSL configuration -echo -e "updating ${warn}${configPath}/${file_mozmodern}${norm}" -sed -i -e "s%${tag_dhparam}%${DHPath}%" "${configPath}/${file_mozmodern}" -sed -i -e "s%${tag_cachain}%${CAChainPath}%" "${configPath}/${file_mozmodern}" +# process mozModern SSL configuration if using SSL +if [ "${useSSL}" -eq 1 ]; then + echo -e "updating ${warn}${configPath}/${file_mozmodern}${norm}" + sed -i -e "s%${tag_dhparam}%${DHPath}%" "${configPath}/${file_mozmodern}" + sed -i -e "s%${tag_cachain}%${CAChainPath}%" "${configPath}/${file_mozmodern}" +fi # process LAN IP in nginx.conf echo -e "updating ${warn}${configPath}/${file_lanip}${norm}"