updated subst php sockets to use alternate delim in sed statement
This commit is contained in:
parent
d7bb02c9f0
commit
95eaf051f4
8
.vscode/numbered-bookmarks.json
vendored
8
.vscode/numbered-bookmarks.json
vendored
@ -6,13 +6,13 @@
|
|||||||
-1,
|
-1,
|
||||||
19,
|
19,
|
||||||
54,
|
54,
|
||||||
746,
|
748,
|
||||||
|
68,
|
||||||
-1,
|
-1,
|
||||||
-1,
|
-1,
|
||||||
-1,
|
-1,
|
||||||
-1,
|
637,
|
||||||
-1,
|
738
|
||||||
733
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
9
setup.sh
9
setup.sh
@ -633,8 +633,9 @@ if [ "${phpType}" = "sockets" ]; then
|
|||||||
if [ -z "${phpSock}" ]; then
|
if [ -z "${phpSock}" ]; then
|
||||||
echo -e "\n${err}Could not auto-detect socket file name${norm}"
|
echo -e "\n${err}Could not auto-detect socket file name${norm}"
|
||||||
echo -e "PHP handler will be set up but you will have to edit ${warn}nginx.conf${norm}"
|
echo -e "PHP handler will be set up but you will have to edit ${warn}nginx.conf${norm}"
|
||||||
echo -e "manually to include the proper socket-file name where you see ${warn}<phpSock>${norm}\n"
|
echo "manually to include the proper socket-file name where you see"
|
||||||
phpSock='<phpSock>'
|
echo -e "${warn}<phpSocketFilename>${norm}"
|
||||||
|
phpSock='<phpSocketFilename>'
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -734,8 +735,8 @@ 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 -e "updating ${warn}${configPath}/${file_phphandler}${norm}"
|
echo -e "updating ${warn}${configPath}/${file_phphandler}${norm}"
|
||||||
# update .insert tag with version number
|
# update .insert file with socket filename or placeholder tag
|
||||||
sed -i "s/${tag_phpSock}/${phpSock}/" "${configPath}/${file_phpSock}"
|
sed -i "s%${tag_phpSock}%${phpSock}%" "${configPath}/${file_phpSock}"
|
||||||
# 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}"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user