Compare commits

..

2 Commits

  1. 10
      grafana/nginx.conf
  2. 1
      hedgedoc/nginx.conf
  3. 3
      matrix/nginx.conf
  4. 3
      nginx/Dockerfile

@ -23,6 +23,16 @@ server {
# required to avoid HTTP 411: see Issue #1486 (https://github.com/dotcloud/docker/issues/1486) # required to avoid HTTP 411: see Issue #1486 (https://github.com/dotcloud/docker/issues/1486)
chunked_transfer_encoding on; chunked_transfer_encoding on;
location = /api/live/ws {
access_log off;
proxy_pass http://grafana:3000;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
location / { location / {
proxy_pass http://grafana:3000; proxy_pass http://grafana:3000;
proxy_set_header Host $host; proxy_set_header Host $host;

@ -47,6 +47,7 @@ server {
# websocket traffic with extra headers for upgrading the connection # websocket traffic with extra headers for upgrading the connection
location /socket.io/ { location /socket.io/ {
access_log off;
proxy_pass http://hedgedoc:3000; proxy_pass http://hedgedoc:3000;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;

@ -43,6 +43,9 @@ server {
# Nginx by default only allows file uploads up to 1M in size # Nginx by default only allows file uploads up to 1M in size
# Increase client_max_body_size to match max_upload_size defined in homeserver.yaml # Increase client_max_body_size to match max_upload_size defined in homeserver.yaml
client_max_body_size 50M; client_max_body_size 50M;
# since this is hitting a few hz sometimes, turn it off
access_log off;
} }
# serve the static content for the well known files # serve the static content for the well known files

@ -18,7 +18,8 @@ RUN echo "configuring" \
# forward request and error logs to docker log collector # forward request and error logs to docker log collector
&& ln -sf /dev/stdout /var/log/nginx/access.log \ && ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log \ && ln -sf /dev/stderr /var/log/nginx/error.log \
&& sed -i -e 's/nginx:x:101:102/nginx:x:33:33/' '/etc/passwd' \ && sed -i -e 's/nginx:x:[0-9]*:[0-9]*/nginx:x:33:33/' '/etc/passwd' \
&& grep nginx /etc/passwd \
&& chown -R 33:33 /var/lib/nginx \ && chown -R 33:33 /var/lib/nginx \
&& echo "Done" && echo "Done"

Loading…
Cancel
Save