Skip to content

Commit

Permalink
Merge pull request roots#1021 from TangRufus/nginx-worker-connections
Browse files Browse the repository at this point in the history
Allow customizing Nginx `worker_connections`
  • Loading branch information
swalkinshaw authored Sep 30, 2018
2 parents d49acb3 + 30bc359 commit 537edff
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
### HEAD
* Allow customizing Nginx `worker_connections` ([#1021](https://github.com/roots/trellis/pull/1021))
* Update wp-cli to 2.0.1 ([#1019](https://github.com/roots/trellis/pull/1019))
* [BREAKING] Update wp-cli to 2.0.0 and verify its PGP signature ([#1014](https://github.com/roots/trellis/pull/1014))
* Deploy: Remove obsoleted `git` remote checking ([#999](https://github.com/roots/trellis/pull/999))
Expand Down
1 change: 1 addition & 0 deletions roles/nginx/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ nginx_ppa: "ppa:nginx/development"
nginx_package: nginx
nginx_conf: nginx.conf.j2
nginx_path: /etc/nginx
nginx_worker_connections: 8000
nginx_logs_root: /var/log/nginx
nginx_user: www-data www-data
nginx_fastcgi_buffers: 8 8k
Expand Down
2 changes: 1 addition & 1 deletion roles/nginx/templates/nginx.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ events {
# That's probably the point at which you hire people who are smarter than you as this is *a lot* of requests.
# Should be < worker_rlimit_nofile.
# Default: 512
worker_connections 8000;
worker_connections {{ nginx_worker_connections }};
}
{% endblock %}

Expand Down

0 comments on commit 537edff

Please sign in to comment.