diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | configs/nginx/ext.d/noop/http-ctx.conf | 0 | ||||
| -rw-r--r-- | configs/nginx/ext.d/noop/main-ctx.conf | 0 | ||||
| -rw-r--r-- | configs/nginx/ext.d/noop/server-ctx.conf | 0 | ||||
| -rw-r--r-- | configs/nginx/nginx.conf | 6 |
5 files changed, 7 insertions, 1 deletions
@@ -5,7 +5,7 @@ TESTENV_LOOP ?= /dev/loop7 TESTENV_CMD ?= /bin/bash -c " \ (socat PTY,link=$(TESTENV_HID) PTY,link=/dev/ttyS11 &) \ && rm -rf /etc/nginx/* \ - && cp /configs/nginx/* /etc/nginx \ + && cp -r /configs/nginx/* /etc/nginx \ && nginx -c /etc/nginx/nginx.conf \ && ln -s $(TESTENV_VIDEO) /dev/kvmd-streamer \ && (losetup -d /dev/kvmd-msd || true) \ diff --git a/configs/nginx/ext.d/noop/http-ctx.conf b/configs/nginx/ext.d/noop/http-ctx.conf new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/configs/nginx/ext.d/noop/http-ctx.conf diff --git a/configs/nginx/ext.d/noop/main-ctx.conf b/configs/nginx/ext.d/noop/main-ctx.conf new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/configs/nginx/ext.d/noop/main-ctx.conf diff --git a/configs/nginx/ext.d/noop/server-ctx.conf b/configs/nginx/ext.d/noop/server-ctx.conf new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/configs/nginx/ext.d/noop/server-ctx.conf diff --git a/configs/nginx/nginx.conf b/configs/nginx/nginx.conf index f831106e..b6aa1eaf 100644 --- a/configs/nginx/nginx.conf +++ b/configs/nginx/nginx.conf @@ -6,6 +6,8 @@ worker_processes 4; # error_log /tmp/nginx.error.log; error_log /dev/null crit; +include /etc/nginx/ext.d/*/main-ctx.conf; + events { worker_connections 1024; use epoll; @@ -38,6 +40,8 @@ http { server 127.0.0.1:8082 fail_timeout=0s max_fails=0; } + include /etc/nginx/ext.d/*/http-ctx.conf; + #PROD server { #PROD listen 80; #PROD server_name localhost; @@ -133,5 +137,7 @@ http { proxy_buffering off; proxy_ignore_headers X-Accel-Buffering; } + + include /etc/nginx/ext.d/*/server-ctx.conf; } } |