CRLF -> LF

Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>

salt/kafka/init.sls

@@ -1,9 +1,9 @@
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
+# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
+# Elastic License 2.0.
-
+
-{# Create map.jinja to enable / disable kafka from UI #}
+{# Create map.jinja to enable / disable kafka from UI #}
-{# Temporarily just enable kafka #}
+{# Temporarily just enable kafka #}
-include:
+include:
-  - kafka.enabled
+  - kafka.enabled

salt/kafka/sostatus.sls

@@ -1,21 +1,21 @@
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
+# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
+# Elastic License 2.0.
-
+
-{% from 'allowed_states.map.jinja' import allowed_states %}
+{% from 'allowed_states.map.jinja' import allowed_states %}
-{% if sls.split('.')[0] in allowed_states %}
+{% if sls.split('.')[0] in allowed_states %}
-
+
-append_so-kafka_so-status.conf:
+append_so-kafka_so-status.conf:
-  file.append:
+  file.append:
-    - name: /opt/so/conf/so-status/so-status.conf
+    - name: /opt/so/conf/so-status/so-status.conf
-    - text: so-kafka
+    - text: so-kafka
-    - unless: grep -q so-kafka /opt/so/conf/so-status/so-status.conf
+    - unless: grep -q so-kafka /opt/so/conf/so-status/so-status.conf
-
+
-{% else %}
+{% else %}
-
+
-{{sls}}_state_not_allowed:
+{{sls}}_state_not_allowed:
-  test.fail_without_changes:
+  test.fail_without_changes:
-    - name: {{sls}}_state_not_allowed
+    - name: {{sls}}_state_not_allowed
-
+
 {% endif %}

salt/manager/tools/sbin/so-kafka-clusterid

@@ -1,22 +1,22 @@
-#!/bin/bash
+#!/bin/bash
-
+
-# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
-# https://securityonion.net/license; you may not use this file except in compliance with the
+# https://securityonion.net/license; you may not use this file except in compliance with the
-# Elastic License 2.0.
+# Elastic License 2.0.
-
+
-local_salt_dir=/opt/so/saltstack/local
+local_salt_dir=/opt/so/saltstack/local
-
+
-if [[ -f /usr/sbin/so-common ]]; then
+if [[ -f /usr/sbin/so-common ]]; then
-  source /usr/sbin/so-common
+  source /usr/sbin/so-common
-else
+else
-  source $(dirname $0)/../../../common/tools/sbin/so-common
+  source $(dirname $0)/../../../common/tools/sbin/so-common
-fi
+fi
-
+
-if ! grep -q "^  kafka_cluster_id:" $local_salt_dir/pillar/secrets.sls; then
+if ! grep -q "^  kafka_cluster_id:" $local_salt_dir/pillar/secrets.sls; then
-    kafka_cluster_id=$(get_random_value 22)
+    kafka_cluster_id=$(get_random_value 22)
-    echo '  kafka_cluster_id: '$kafka_cluster_id >> $local_salt_dir/pillar/secrets.sls
+    echo '  kafka_cluster_id: '$kafka_cluster_id >> $local_salt_dir/pillar/secrets.sls
-else
+else
-    echo 'kafka_cluster_id exists'
+    echo 'kafka_cluster_id exists'
-    salt-call pillar.get secrets
+    salt-call pillar.get secrets
 fi