From aa2bc791a49c2516c1418813547efd6434db850c Mon Sep 17 00:00:00 2001 From: Reid Beels Date: Mon, 7 Aug 2017 10:29:26 -0700 Subject: [PATCH] Load modules-enabled config files The nginx package was updated earlier this year to include `modules-available` and `modules-enabled` directories in `/etc/nginx`. This adds loading of conf files from modules-enabled to the top of the trellis nginx.conf (in a new `modules_enabled` block). --- roles/nginx/templates/nginx.conf.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2 index f72d73e8db..9e3b5c95c8 100644 --- a/roles/nginx/templates/nginx.conf.j2 +++ b/roles/nginx/templates/nginx.conf.j2 @@ -3,6 +3,10 @@ # nginx Configuration File # http://wiki.nginx.org/Configuration +{% block modules_enabled -%} +include modules-enabled/*.conf; +{% endblock %} + {% block user %} # Run as a less privileged user for security reasons. user {{ nginx_user }};