diff options
| author | Dessalines <tyhou13@gmx.com> | 2020-06-28 13:44:42 -0400 |
|---|---|---|
| committer | Dessalines <tyhou13@gmx.com> | 2020-06-28 13:44:42 -0400 |
| commit | 0112d0d9551836c1a525203a8fef27c94e640405 (patch) | |
| tree | ff1ec29b8cd85caa5758b19166399a695af9a53b | |
| parent | 6672cbc253e1b8d04a60cd34c2f58cf0d12efb13 (diff) | |
Fixing test deploy, adding a rate limiter to ansible nginx config.
| -rw-r--r-- | ansible/templates/nginx.conf | 4 | ||||
| -rwxr-xr-x | docker/dev/test_deploy.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ansible/templates/nginx.conf b/ansible/templates/nginx.conf index b710fdb3..5847bad0 100644 --- a/ansible/templates/nginx.conf +++ b/ansible/templates/nginx.conf @@ -1,4 +1,5 @@ proxy_cache_path /var/cache/lemmy_frontend levels=1:2 keys_zone=lemmy_frontend_cache:10m max_size=100m use_temp_path=off; +limit_req_zone $binary_remote_addr zone=lemmy_ratelimit:10m rate=1r/s; server { listen 80; @@ -51,6 +52,9 @@ server { # Upload limit for pictrs client_max_body_size 20M; + # Rate limit + limit_req zone=lemmy_ratelimit burst=30 nodelay; + location / { proxy_pass http://0.0.0.0:8536; proxy_set_header X-Real-IP $remote_addr; diff --git a/docker/dev/test_deploy.sh b/docker/dev/test_deploy.sh index c2ecc0c8..7641c940 100755 --- a/docker/dev/test_deploy.sh +++ b/docker/dev/test_deploy.sh @@ -9,10 +9,10 @@ export COMPOSE_DOCKER_CLI_BUILD=1 export DOCKER_BUILDKIT=1 # Rebuilding dev docker -sudo docker build . -f "docker/dev/Dockerfile" -t "dessalines/lemmy:$BRANCH" +sudo docker build ../../ -f . -t "dessalines/lemmy:$BRANCH" sudo docker push "dessalines/lemmy:$BRANCH" # Run the playbook -pushd ../lemmy-ansible +pushd ../../../lemmy-ansible ansible-playbook -i test playbooks/site.yml popd |