grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix invalid config in docker/prod (fixes #2520) (#2524)

Browse source
This commit is contained in:
Nutomic 2022-11-02 18:50:09 +00:00 committed by GitHub
parent ed9e91345a
commit 28eade6168
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 134 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/utils/translations

@ -1 +1 @@
Subproject commit f5d6f0eabafd559417bf8f203fd655f7858bffcf Subproject commit 454debaede4cc932ac15fea9bf620cf1daf1ae4c

1
docker/prod/docker-compose.yml
View file

@ -34,6 +34,7 @@ services:
networks: networks:
- lemmyinternal - lemmyinternal
restart: always restart: always
environment:
- RUST_LOG="warn,lemmy_server=info,lemmy_api=info,lemmy_api_common=info,lemmy_api_crud=info,lemmy_apub=info,lemmy_db_schema=info,lemmy_db_views=info,lemmy_db_views_actor=info,lemmy_db_views_moderator=info,lemmy_routes=info,lemmy_utils=info,lemmy_websocket=info" - RUST_LOG="warn,lemmy_server=info,lemmy_api=info,lemmy_api_common=info,lemmy_api_crud=info,lemmy_apub=info,lemmy_db_schema=info,lemmy_db_views=info,lemmy_db_views_actor=info,lemmy_db_views_moderator=info,lemmy_routes=info,lemmy_utils=info,lemmy_websocket=info"
volumes: volumes:
- ./lemmy.hjson:/config/config.hjson - ./lemmy.hjson:/config/config.hjson

7
docker/prod/nginx.conf
View file

@ -1,10 +1,6 @@
# nginx example config # nginx example config
# replace {{yourdomain}} and review the certbot/letsencrypt config # replace {{yourdomain}} and review the certbot/letsencrypt config
worker_processes 1;
events {
worker_connections 1024;
}
http {
limit_req_zone $binary_remote_addr zone={{yourdomain}}_ratelimit:10m rate=1r/s; limit_req_zone $binary_remote_addr zone={{yourdomain}}_ratelimit:10m rate=1r/s;
upstream lemmy { upstream lemmy {
@ -149,4 +145,3 @@ http {
default 0.0.0.0; default 0.0.0.0;
} }
access_log /var/log/nginx/access.log combined; access_log /var/log/nginx/access.log combined;
}