From b3045fde77baa52c1e76dd0f143ced265762f77b Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Dec 27 2023 16:48:57 +0000 Subject: Switch nginx.ng to nginx Signed-off-by: Georg Pfuetzenreuter --- diff --git a/bin/test_nginx.sh b/bin/test_nginx.sh index 1048c23..eed1abf 100755 --- a/bin/test_nginx.sh +++ b/bin/test_nginx.sh @@ -115,7 +115,7 @@ for role in $(bin/get_roles.py); do done fi echo 'Applying nginx ...' >> "$out" - salt-call --local state.apply nginx.ng >> "$out" + salt-call --local state.apply nginx >> "$out" create_fake_certs touch_includes $role diff --git a/salt/profile/web/server/nginx.sls b/salt/profile/web/server/nginx.sls index 11a9734..6028370 100644 --- a/salt/profile/web/server/nginx.sls +++ b/salt/profile/web/server/nginx.sls @@ -1,7 +1,7 @@ {% set csr_dict = salt['pillar.get']('profile:web:server:nginx:csr', {}) %} include: - - nginx.ng + - nginx {% for domain, csr in csr_dict.items() %} /etc/nginx/ssl/{{ domain }}.csr: