diff --git a/salt/filebeat/init.sls b/salt/filebeat/init.sls index 00a3d5054..a637fd2f9 100644 --- a/salt/filebeat/init.sls +++ b/salt/filebeat/init.sls @@ -60,5 +60,5 @@ so-filebeat: - /nsm/bro/spool/manager:/nsm/bro/spool:ro - /opt/so/log/suricata:/suricata:ro - /opt/so/conf/filebeat/etc/pki/filebeat.crt:/usr/share/filebeat/filebeat.crt:ro - - /opt/so/conf/filebeat/etc/pki/filebeat.p8:/usr/share/filebeat/filebeat.p8:ro + - /opt/so/conf/filebeat/etc/pki/filebeat.key:/usr/share/filebeat/filebeat.key:ro - /etc/ssl/certs/intca.crt:/usr/share/filebeat/intraca.crt:ro diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index 08532dcd2..8b506e410 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -31,11 +31,6 @@ m2cryptopkgs: bits: 4096 backup: True -# Convert the key to pkcs#8 so logstash will work correctly. -filebeatpkcs: - cmd.run: - - name: "/usr/bin/openssl pkcs8 -in /etc/pki/filebeat.key -topk8 -out /etc/pki/filebeat.p8 -passout pass:" - # Create Symlinks to the keys so I can distribute it to all the things filebeatdir: file.directory: