From be028aa23e96f61854a3d02b51cc15f8c0aa4097 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 28 Jun 2023 10:58:13 -0400 Subject: [PATCH] define ca_server for nginx.ssl --- salt/nginx/ssl.sls | 2 ++ salt/ssl/init.sls | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/nginx/ssl.sls b/salt/nginx/ssl.sls index b6d09b899..fbcf2b6c6 100644 --- a/salt/nginx/ssl.sls +++ b/salt/nginx/ssl.sls @@ -7,6 +7,8 @@ {% if sls.split('.')[0] in allowed_states %} {% from 'vars/globals.map.jinja' import GLOBALS %} {% from 'nginx/map.jinja' import NGINXMERGED %} +{# since nginx runs on the manager we can just use the hostname as the ca server #} +{% set ca_server = GLOBALS.hostname %} {# if the user has selected to replace the crt and key in the ui #} {% if NGINXMERGED.ssl.replace_cert %} diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index 48f643e29..4bb706d63 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -507,8 +507,6 @@ elasticp12perms: - mode: 640 - group: 930 - - {% endif %}