From b57b0eee36d7a8f708b7a3e65c96323770ad18a7 Mon Sep 17 00:00:00 2001 From: Erwan Schaeffner Date: Mon, 22 May 2023 10:32:20 +0000 Subject: [PATCH] fix: stream block manager --- templates/conf.d/nginx.conf.erb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/templates/conf.d/nginx.conf.erb b/templates/conf.d/nginx.conf.erb index 435ed6658..3f017d72e 100644 --- a/templates/conf.d/nginx.conf.erb +++ b/templates/conf.d/nginx.conf.erb @@ -332,11 +332,6 @@ mail { <% end -%> <% if @stream -%> stream { - <%-# conf.stream.d gets included either way if $stream is enabled -%> - include <%= @conf_dir %>/conf.stream.d/*.conf; -<% unless @confd_only -%> - include <%= @conf_dir %>/streams-enabled/*; -<% end -%> <% unless @stream_log_format.empty? -%> <% @stream_log_format.sort.each do |key,value| -%> @@ -347,5 +342,11 @@ stream { <%- Array(@stream_access_log).each do |log_item| -%> access_log <%= log_item %><% if @stream_custom_format_log %> <%= @stream_custom_format_log%><% end %>; <% end -%> + + <%-# conf.stream.d gets included either way if $stream is enabled -%> + include <%= @conf_dir %>/conf.stream.d/*.conf; +<% unless @confd_only -%> + include <%= @conf_dir %>/streams-enabled/*; +<% end -%> } <% end -%>