From 9aaec466e28eaa8e6edd9c5a75de6549457d760d Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Wed, 30 May 2018 11:24:29 -0400
Subject: [PATCH] SSL Module - We have certs

---
 salt/ssl/init.sls | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index 3e06912bb..47b164f77 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -1,18 +1,19 @@
+{% set master = salt['grains.get']('master') %}
 # Trust the CA
 /usr/local/share/ca-certificates:
   file.directory: []
 
 /usr/local/share/ca-certificates/intca.crt:
   x509.pem_managed:
-    - text: {{ salt['mine.get']('master', 'x509.get_pem_entries')['master']['/etc/pki/ca.crt']|replace('\n', '') }}
+    - text:  {{ salt['mine.get'](master, 'x509.get_pem_entries')[master]['/etc/pki/ca.crt']|replace('\n', '') }}
 
 # Request a cert and drop it where it needs to go to be distributed
 /etc/pki/filebeat.crt:
   x509.certificate_managed:
-    - ca_server: ca.example.com
+    - ca_server: testnode1
     - signing_policy: filebeat
     - public_key: /etc/pki/filebeat.key
-    - CN: security.onion
+    - CN: ca.example.com
     - days_remaining: 3000
     - backup: True
     - managed_private_key: