diff --git a/.vscode/numbered-bookmarks.json b/.vscode/numbered-bookmarks.json index ea7bab8..35618bd 100644 --- a/.vscode/numbered-bookmarks.json +++ b/.vscode/numbered-bookmarks.json @@ -6,7 +6,7 @@ -1, 19, 54, - 774, + 788, 68, -1, -1, diff --git a/setup.sh b/setup.sh index ae6107a..9757730 100755 --- a/setup.sh +++ b/setup.sh @@ -767,6 +767,20 @@ if [ "${phpType}" = "sockets" ]; then sed -i 's/^\s*index/\ index index.php/' "${configPath}/${file_phphandler}" fi +# comment all SSL related entries if NOT using SSL +if [ "${useSSL}" -eq 0 ]; then + # comment ssl locations in ssl_certs.conf + echo -e "disabling SSL paths in ${warn}${configPath}/${file_ssl}${norm}" + sed -i 's/^ssl_certificate/#ssl_certificate/g' "${configPath}/${file_ssl}" + # comment ssl_dhparam in mozModern_ssl.conf + echo -e "disabling DHparams in ${warn}${configPath}/${file_mozmodern}${norm}" + sed -i 's/^ssl_dhparam/#ssl_dhparam/' "${configPath}/${file_mozmodern}" + # comment OCSP section in mozModern_ssl.conf + echo -e "disabling OCSP stapling in ${warn}${configPath}/${file_mozmodern}${norm}" + sed -i 's/^ssl_stapling/#ssl_stapling/g' "${configPath}/${file_mozmodern}" + sed -i 's/^ssl_trusted/#ssl_trusted/' "${configPath}/${file_mozmodern}" +fi + # notify user file updates are completed echo -e "${ok}...files updated${norm}" echo -e "${mag}---------------------${norm}\n"