From 004a8b5d93542b29238f252dfdb25c1373561f82 Mon Sep 17 00:00:00 2001 From: ale Date: Mon, 18 Nov 2024 22:05:57 +0100 Subject: [PATCH] nginx.conf out Signed-off-by: ale --- Dockerfile | 3 ++- nginx.conf | 36 ------------------------------------ 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 nginx.conf diff --git a/Dockerfile b/Dockerfile index 646fd00..152e5f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM nginx RUN apt update && apt install -y git && apt clean RUN git clone --depth 1 https://github.com/TuxInvader/nginx-dns /etc/nginx/nginx-dns -COPY nginx.conf dns.conf domains.txt domains_v6.txt /etc/nginx/ +RUN echo "include /etc/nginx/dns.conf" >> /etc/nginx/nginx.conf +COPY dns.conf domains.txt domains_v6.txt /etc/nginx/ diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index 013f88f..0000000 --- a/nginx.conf +++ /dev/null @@ -1,36 +0,0 @@ -load_module modules/ngx_stream_js_module.so; -user nginx; -worker_processes auto; - -error_log /var/log/nginx/error.log notice; -pid /var/run/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - #tcp_nopush on; - - keepalive_timeout 65; - - #gzip on; - - include /etc/nginx/conf.d/*.conf; -} - -stream { - include /etc/nginx/dns.conf; -}