Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix hard-coded mime.types location (#16826)

Browse Source
This commit is contained in:
Shrikant Sharat Kandula 2022-09-16 16:37:23 +05:30 committed by GitHub
parent 8d2ac7ec87
commit fc983fc65e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/client/start-https.sh
View File

@ -7,6 +7,8 @@ if [[ -n ${TRACE-} ]]; then
set -o xtrace set -o xtrace
fi fi
cd "$(dirname "$0")"
if [[ ${1-} =~ ^-*h(elp)?$ ]]; then if [[ ${1-} =~ ^-*h(elp)?$ ]]; then
echo 'Run '"$0"' [option...] echo 'Run '"$0"' [option...]
@ -148,9 +150,14 @@ fi
if [[ -f /etc/nginx/mime.types || $run_as == docker ]]; then if [[ -f /etc/nginx/mime.types || $run_as == docker ]]; then
mime_types=/etc/nginx/mime.types mime_types=/etc/nginx/mime.types
elif [[ -f /usr/local/etc/nginx/mime.types ]]; then elif type nginx >/dev/null; then
mime_types=/usr/local/etc/nginx/mime.types mime_types="$(dirname "$(nginx -t 2>&1 | head -1 | cut -d' ' -f5)")/mime.types"
else if [[ ! -f $mime_types ]]; then
mime_types=
fi
fi
if [[ -z ${mime_types-} ]]; then
echo "No mime.types file found. Can't start NGINX." >&2 echo "No mime.types file found. Can't start NGINX." >&2
exit 1 exit 1
fi fi
@ -284,7 +291,7 @@ if [[ -f $nginx_pid ]]; then
# We never run `nginx` without the `-c` argument, since that can load the default system configuration, which is # We never run `nginx` without the `-c` argument, since that can load the default system configuration, which is
# different for different systems. It introduces too many unknowns, with little value. # different for different systems. It introduces too many unknowns, with little value.
# So we build a temp config, just to have a predictable value for the `pid` directive. # So we build a temp config, just to have a predictable value for the `pid` directive.
temp_nginx_conf="$PWD/nginx/temp.nginx.conf" temp_nginx_conf="$working_dir/temp.nginx.conf"
echo "pid $nginx_pid; events { worker_connections 1024; }" > "$temp_nginx_conf" echo "pid $nginx_pid; events { worker_connections 1024; }" > "$temp_nginx_conf"
nginx -c "$temp_nginx_conf" -s quit nginx -c "$temp_nginx_conf" -s quit
rm "$nginx_pid" "$temp_nginx_conf" rm "$nginx_pid" "$temp_nginx_conf"