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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
projects/
mergin_db

logs
*.log
.DS_Store
*.stackdump
Expand Down
3 changes: 2 additions & 1 deletion development.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading