From 62ae5c436b5b02ed5c46b49bc7dabaf9f9b0b700 Mon Sep 17 00:00:00 2001 From: Martin Varga Date: Tue, 21 Jan 2025 08:48:38 +0100 Subject: [PATCH] Add option for nginx logs written to file --- .gitignore | 1 + development.md | 3 ++- docker-compose.yml | 1 + nginx.conf | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f8c895c2..4b7c63da 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ projects/ mergin_db +logs *.log .DS_Store *.stackdump diff --git a/development.md b/development.md index 9e92f0d0..640a3459 100644 --- a/development.md +++ b/development.md @@ -67,7 +67,8 @@ If you want to run the whole stack locally, you can use the docker. Docker will docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d # Give ownership of the ./projects folder to user that is running the gunicorn container -sudo chown 901:999 projects/ +sudo chown 901:999 projects +sudo chown 101:999 logs # init db and create user docker exec -it merginmaps-server flask init-db diff --git a/docker-compose.yml b/docker-compose.yml index 68748caa..3eab104c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,5 +94,6 @@ services: volumes: - ./projects:/data # map data dir to host - ./nginx.conf:/etc/nginx/conf.d/default.conf + - ./logs:/var/log/nginx/ networks: - merginmaps diff --git a/nginx.conf b/nginx.conf index ed4512ad..a0b4ddbf 100644 --- a/nginx.conf +++ b/nginx.conf @@ -10,6 +10,11 @@ server { # We are only proxying - not returning any files #root /dev/null; + # Logs - uncomment to enable logs written to file + # make sure mounted directory has correct permissions and beware of disk space used by the logs + # access_log /var/log/nginx/access.log; + # error_log /var/log/nginx/error.log warn; + location / { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme;