asif/nginx-basic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added missing -e parameter to echo in subst notifications

Browse Source
This commit is contained in:
Asif Bacchus 2019-01-06 01:43:32 -07:00
parent c7ea64cd92
commit b8111c1711
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
setup.sh
View File

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