Merge pull request #22 from jsommerville-untangle/15-Fix-Nginx-Revers…

…e-Proxy Fixing reverse proxy default conf
coreruleset · Jan 29, 2021 · 9f81a87 · 9f81a87
2 parents e2bafeb + 42bd6a2
commit 9f81a87
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/3.3-nginx/Dockerfile b/3.3-nginx/Dockerfile
@@ -26,7 +26,6 @@ ENV PARANOIA=1 \
     MODSEC_PCRE_MATCH_LIMIT_RECURSION=100000
 
 COPY 3.3-nginx/docker-entrypoint.sh /
-COPY 3.3-nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 COPY 3.3-nginx/nginx.conf /etc/nginx/nginx.conf
 COPY src/opt/modsecurity/activate-rules.sh /opt/modsecurity/
 COPY src/etc/modsecurity.d/*.conf /etc/modsecurity.d/

diff --git a/3.3-nginx/conf.d/default.conf b/3.3-nginx/conf.d/default.conf
diff --git a/3.3-nginx/docker-entrypoint.sh b/3.3-nginx/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+export DNS_SERVER=${DNS_SERVER:-$(cat /etc/resolv.conf |grep -i '^nameserver'|head -n1|cut -d ' ' -f2)}
+
 ENV_VARIABLES=$(awk 'BEGIN{for(v in ENVIRON) print "$"v}')
 
 for FILE in etc/nginx/nginx.conf etc/nginx/conf.d/default.conf etc/nginx/conf.d/logging.conf etc/modsecurity.d/modsecurity-override.conf