From 69670c481de48229b8a1ce1b29f1aa4e16ace793 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 28 Jun 2023 11:32:08 -0400 Subject: [PATCH] fix require logic for nginx container --- salt/nginx/enabled.sls | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/salt/nginx/enabled.sls b/salt/nginx/enabled.sls index dc2c6dcc4..7dfe7560d 100644 --- a/salt/nginx/enabled.sls +++ b/salt/nginx/enabled.sls @@ -83,12 +83,17 @@ so-nginx: {% endif%} - require: - file: nginxconf - {% if grains.role in ['so-manager', 'so-managersearch', 'so-eval', 'so-standalone', 'so-import'] %} +{% if grains.role in ['so-manager', 'so-managersearch', 'so-eval', 'so-standalone', 'so-import'] %} +{% if NGINXMERGED.ssl.replace_cert %} + - file: managerssl_key + - file: managerssl_crt +{% else %} - x509: managerssl_key - x509: managerssl_crt +{% endif%} - file: navigatorconfig - file: navigatordefaultlayer - {% endif %} +{% endif %} delete_so-nginx_so-status.disabled: file.uncomment: