mirrors/takahe
1
1
Fork 0
mirror of https://github.com/jointakahe/takahe.git synced 2024-11-25 16:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Switch from hardcoding quad9 to reading resolv.conf

Browse source
This commit is contained in:
Andrew Godwin 2023-02-19 10:33:52 -07:00
parent 79aea1b8ba
commit aa592b496a
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/nginx.conf.d/default.conf.tpl
View file

@ -74,7 +74,7 @@ server {
internal; internal;
# Reconstruct the remote URL # Reconstruct the remote URL
resolver 9.9.9.9 149.112.112.112 ipv6=off; resolver __NAMESERVER__ valid=10s;
# Unset Authorization and Cookie for security reasons. # Unset Authorization and Cookie for security reasons.
proxy_set_header Authorization ''; proxy_set_header Authorization '';

8
docker/run.sh
View file

@ -1,8 +1,12 @@
#!/bin/bash #!/bin/bash
# Set up cache size # Set up cache size and nameserver subs
CACHE_SIZE="${TAKAHE_NGINX_CACHE_SIZE:-1g}" CACHE_SIZE="${TAKAHE_NGINX_CACHE_SIZE:-1g}"
sed s/__CACHESIZE__/${CACHE_SIZE}/g /etc/nginx/conf.d/default.conf.tpl > /etc/nginx/conf.d/default.conf NAMESERVER=`cat /etc/resolv.conf | grep "nameserver" | awk '{print $2}' | tr '\n' ' '`
if [ -z "$NAMESERVER" ]; then
NAMESERVER="9.9.9.9 149.112.112.112"
fi
sed "s/__CACHESIZE__/${CACHE_SIZE}/g" /etc/nginx/conf.d/default.conf.tpl | sed "s/__NAMESERVER__/${NAMESERVER}/g" > /etc/nginx/conf.d/default.conf
# Run nginx and gunicorn # Run nginx and gunicorn
nginx & nginx &