From d6c651af1c730d82e2c0aba1a72bb238ad338b15 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Mon, 20 Dec 2021 09:42:27 -0500
Subject: [PATCH] Remove old patch dir from previously-patched installations

---
 salt/elasticsearch/init.sls | 4 ++++
 salt/logstash/init.sls      | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index b5d61a6a5..3d365cc83 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -131,6 +131,10 @@ esrolesdir:
     - group: 939
     - makedirs: True
 
+eslibdir:
+  file.absent:
+    - name: /opt/so/conf/elasticsearch/lib
+    
 esingestdynamicconf:
   file.recurse:
     - name: /opt/so/conf/elasticsearch/ingest
diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index 069b2f7bd..2ad5a78e0 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -61,6 +61,10 @@ logstash:
     - gid: 931
     - home: /opt/so/conf/logstash
 
+lslibdir:
+  file.absent:
+    - name: /opt/so/conf/logstash/lib
+    
 lsetcdir:
   file.directory:
     - name: /opt/so/conf/logstash/etc