From 487ac2430656874b773605599f7452cae2e7dcfc Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 28 Dec 2021 11:16:01 -0500 Subject: [PATCH] revert back to getting ca from mine --- salt/ssl/init.sls | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index 1bd218d8f..57a8b519b 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -23,9 +23,15 @@ include: {% else %} include: - ca.dirs - {% set x509dict = salt['mine.get'](manager, 'x509.get_pem_entries') %} - {% set trusttheca_text = x509dict[manager].get('/etc/pki/ca.crt')|replace('\n', '') %} - {% set ca_server = manager %} + {% set x509dict = salt['mine.get'](manager~'*', 'x509.get_pem_entries') %} + {% for host in x509dict %} + {% if 'manager' in host.split('_')|last or host.split('_')|last == 'standalone' %} + {% do global_ca_text.append(x509dict[host].get('/etc/pki/ca.crt')|replace('\n', '')) %} + {% do global_ca_server.append(host) %} + {% endif %} + {% endfor %} + {% set trusttheca_text = global_ca_text[0] %} + {% set ca_server = global_ca_server[0] %} {% endif %} # Trust the CA