From 7c1d3fe6d78d3682bd545654885b015146413d04 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 6 Jun 2018 11:50:16 -0400 Subject: [PATCH] SSL Module - Fix some paths --- salt/ssl/init.sls | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index 9d47f586a..449abb830 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -1,10 +1,11 @@ {% set master = salt['grains.get']('master') %} # Trust the CA -/usr/local/share/ca-certificates: - file.directory: [] +#/usr/local/share/ca-certificates: +# file.directory: [] -/usr/local/share/ca-certificates/intca.crt: +trusttheca: x509.pem_managed: + - name: /etc/ssl/certs/intca.crt - text: {{ salt['mine.get'](master, 'x509.get_pem_entries')[master]['/etc/pki/ca.crt']|replace('\n', '') }} {% if grains['role'] == 'so-master' %} @@ -23,7 +24,11 @@ backup: True # Create Symlinks to the keys so I can distribute it to all the things - +filebeatdir: + file.directory: + - name: /opt/so/saltstack/salt/filebeat/files + - mkdirs: True + fbkeylink: file.symlink: - name: /opt/so/saltstack/salt/filebeat/files/filebeat.key