summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2017-01-04 13:11:16 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2017-01-04 13:11:16 +0100
commitd13ba28bd480075bf07c3f37a696b5163369d512 (patch)
tree475a67c8282429a2b1ef3fc2e3f00e14628722a9
parente1b0e5a387b49731f62be0224519644708c4267f (diff)
downloaddeployment-d13ba28bd480075bf07c3f37a696b5163369d512.tar.gz
deployment-d13ba28bd480075bf07c3f37a696b5163369d512.tar.bz2
deployment-d13ba28bd480075bf07c3f37a696b5163369d512.zip
conf dockerized nginx
-rw-r--r--docker/nginx/Dockerfile2
-rw-r--r--docker/nginx/nginx.conf33
2 files changed, 35 insertions, 0 deletions
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index c74a81f..269f14e 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -1,3 +1,5 @@
FROM nginx
COPY ./proxy.conf /etc/nginx/sites-enabled/
+
+COPY ./nginx.conf /etc/nginx/
diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf
new file mode 100644
index 0000000..d9a2177
--- /dev/null
+++ b/docker/nginx/nginx.conf
@@ -0,0 +1,33 @@
+
+user nginx;
+worker_processes 1;
+
+error_log /var/log/nginx/error.log warn;
+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;
+ include /etc/nginx/sites-enabled/*;
+}