Merge remote-tracking branch 'downstream/master'

cisagov · May 28, 2020 · 8062b49 · 8062b49
2 parents 2a2f3cb + eaa9224
commit 8062b49
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scripts/malcolm_appliance_packager.sh b/scripts/malcolm_appliance_packager.sh
@@ -91,7 +91,7 @@ if mkdir "$DESTDIR"; then
   cp $VERBOSE ./README.md "$DESTDIR/"
   cp $VERBOSE ./logstash/certs/*.conf "$DESTDIR/logstash/certs/"
   cp $VERBOSE ./elastalert/config/* "$DESTDIR/elastalert/config/"
-  cp $VERBOSE ./elastalert/rules/* "$DESTDIR/elastalert/rules/" 2>/dev/null || true
+  rm -f "$DESTDIR/elastalert/config/"smtp-auth.yaml
   cp $VERBOSE ./elastalert/sample-rules/* "$DESTDIR/elastalert/sample-rules/" 2>/dev/null || true
   pushd "$DESTDIR" >/dev/null 2>&1
   pushd "./scripts" >/dev/null 2>&1