From 0ffb4576d2940db29cc8c512f6320445ad87f71d Mon Sep 17 00:00:00 2001 From: Thomas Thorburn Date: Mon, 12 Jul 2021 15:26:53 +0200 Subject: [PATCH] bring formula up to date with master --- nginx/servers_config.sls | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nginx/servers_config.sls b/nginx/servers_config.sls index 2b87f1d..7d77987 100644 --- a/nginx/servers_config.sls +++ b/nginx/servers_config.sls @@ -10,14 +10,10 @@ {% set server_states = [] %} {#- _nginx is a lightened copy of nginx map intended to passed in templates #} {%- set _nginx = nginx.copy() %} -<<<<<<< HEAD {%- do _nginx.pop('snippets') %} -{%- do _nginx.pop('streams') %} -{%- do _nginx.pop('servers') %} -======= +{%- do _nginx.pop('streams') if nginx.streams is defined %} {%- do _nginx.pop('snippets') if nginx.snippets is defined %} {%- do _nginx.pop('servers') if nginx.servers is defined %} ->>>>>>> 6a42a9bdf84e764cb4b3313ad2b6d95688517dec # Simple path concatenation. # Needs work to make this function on windows.