Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docker-compose-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ services:
ports:
- 80:80
volumes:
- ./nginx:/etc/nginx/conf.d
- ./nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
depends_on:
- redis
networks:
Expand Down
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ services:
ports:
- 80:80
volumes:
- ./nginx:/etc/nginx/conf.d
- ./nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
depends_on:
- redis
ingame:
Expand Down
1 change: 0 additions & 1 deletion nginx/default.conf → nginx/conf.d/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,3 @@ server {
nchan_redis_pass my_redis_server;
}
}

34 changes: 34 additions & 0 deletions nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# load Nchan module
load_module /usr/local/nginx/modules/ngx_nchan_module.so;

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" "$request_body"'
'"$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;
}