about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaweł Dybiec <pdybiec@stud.cs.uni.wroc.pl>2019-10-13 20:24:39 +0200
committerPaweł Dybiec <pdybiec@stud.cs.uni.wroc.pl>2019-10-13 20:24:39 +0200
commitda7c9839c51b03f69152e491c3c8cf1a8936f97c (patch)
treea1adbe5d5b1e08db3cde308564c9a0a1dc8190f4
parentAdded config for quick sharing of local files (diff)
Cleanup of nginx config and blocked some scanning server
-rw-r--r--compose/nginx/Dockerfile12
-rw-r--r--compose/nginx/blockIps.conf1
-rw-r--r--compose/nginx/nginx.conf1
3 files changed, 12 insertions, 2 deletions
diff --git a/compose/nginx/Dockerfile b/compose/nginx/Dockerfile
index fcca1df..ea6be25 100644
--- a/compose/nginx/Dockerfile
+++ b/compose/nginx/Dockerfile
@@ -1,4 +1,12 @@
-FROM nginx:1.15.8-alpine
+FROM nginx:alpine
+RUN rm /etc/nginx/fastcgi.conf \
+       /etc/nginx/fastcgi_params \
+       /etc/nginx/scgi_params \
+       /etc/nginx/uwsgi_params \
+       /etc/nginx/koi-utf \
+       /etc/nginx/koi-win \
+       /etc/nginx/win-utf
 COPY static-html /usr/share/nginx/html
 COPY conf.d /etc/nginx/conf.d
-COPY nginx.conf /etc/nginx/nginx.conf
+COPY nginx.conf /etc/nginx/
+COPY blockIps.conf /etc/nginx/
diff --git a/compose/nginx/blockIps.conf b/compose/nginx/blockIps.conf
new file mode 100644
index 0000000..d434459
--- /dev/null
+++ b/compose/nginx/blockIps.conf
@@ -0,0 +1 @@
+deny 154.202.59.137;
diff --git a/compose/nginx/nginx.conf b/compose/nginx/nginx.conf
index 8bf1733..1e21693 100644
--- a/compose/nginx/nginx.conf
+++ b/compose/nginx/nginx.conf
@@ -52,6 +52,7 @@ http {
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
 
     include /etc/nginx/conf.d/*.conf;
+    include /etc/nginx/blockIps.conf;
 
     error_page 500 501 502 503 504 /50x.html;
 }