diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 28ad66e..1e305ae 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,6 +1,7 @@ ARG NGINX_VERSION=stable FROM nginx:${NGINX_VERSION}-alpine +COPY nginx.conf /etc/nginx/ COPY conf.d/ /etc/nginx/conf.d/ COPY srv/ /srv/ ADD h5ai-0.30.0.tar.gz /srv/http/files/ diff --git a/nginx/conf.d/forbid.conf b/nginx/conf.d/forbid.conf deleted file mode 100644 index 033eb08..0000000 --- a/nginx/conf.d/forbid.conf +++ /dev/null @@ -1,7 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name _; - - return 301 http://nas.sigkill.top; -} diff --git a/nginx/nginx.conf b/nginx/nginx.conf new file mode 100644 index 0000000..d0cd52b --- /dev/null +++ b/nginx/nginx.conf @@ -0,0 +1,39 @@ + +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log error; +pid /var/run/nginx.pid; + +events { + worker_connections 64; +} + + +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; + + server { + listen 80; + listen [::]:80; + server_name _; + + return 301 http://nas.sigkill.top; + } + + include /etc/nginx/conf.d/*.conf; +}