diff --git a/setup.sh b/setup.sh index acbebff..97418c7 100755 --- a/setup.sh +++ b/setup.sh @@ -590,7 +590,7 @@ echo -e "\n${mag}---------------------${norm}" echo -e "${cyan}Updating template files now...${norm}" # copy template files to working versions -echo "copying files to dedicated directory for customization" +echo "copying files to dedicated directory for customization:" echo -e "${warn}${configPath}${norm}\n" rm -rf "${configPath}" cp -R ./etc "${configPath}" @@ -603,28 +603,28 @@ done sed -i "/${tag_servernames}/d" "${configPath}/${file_servernames}" # process SSL snippet -echo "updating ${warn}${configPath}/${file_ssl}${norm}" +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 mozModern SSL configuration -echo "updating ${warn}${configPath}/${file_mozmodern}${norm}" +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 LAN IP in nginx.conf -echo "updating ${warn}${configPath}/${file_lanip}${norm}" +echo -e "updating ${warn}${configPath}/${file_lanip}${norm}" sed -i "s/${tag_lanip}/${IP4}" "${configPath}/${file_lanip}" # if using PHP: process buffers.conf if [ "${usePHP}" -eq 1 ]; then - echo "updating ${warn}${configPath}/${file_buffers}${norm}" + echo -e "updating ${warn}${configPath}/${file_buffers}${norm}" cat "${configPath}/${file_buffersPHP}" >> "${configPath}/${file_buffers}" fi ## if using PHP-TCP: add upstream handler in nginx.conf if [ "${phpType}" = "tcp" ]; then - echo "updating ${warn}${configPath}/${file_phphandler}${norm}" + echo -e "updating ${warn}${configPath}/${file_phphandler}${norm}" # copy .insert file into nginx.conf sed -i -e "/${tag_phphandler}/{r ${configPath}/${file_phpTCP}" -e 'd}' "${configPath}/${file_phphandler}" # update tags with address and port information @@ -634,7 +634,7 @@ fi # if using PHP-SOCK: add upstream handler in nginx.conf if [ "${phpType}" = "sockets" ]; then - echo "updating ${warn}${configPath}/${file_phphandler}${norm}" + echo -e "updating ${warn}${configPath}/${file_phphandler}${norm}" # copy .insert file into nginx.conf sed -i -e "/${tag_phphandler}/{r ${configPath}/${file_phpSOCK}" -e 'd}' "${configPath}/${file_phphandler}" # update tag with version number