diff --git a/salt/common/init.sls b/salt/common/init.sls index 14cf3d4e8..120e73e3e 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -20,11 +20,6 @@ kernel.printk: sysctl.present: - value: "3 4 1 3" -# Remove variables.txt from /tmp - This is temp -rmvariablesfile: - file.absent: - - name: /tmp/variables.txt - # Add socore Group socoregroup: group.present: @@ -149,28 +144,6 @@ common_sbin_jinja: - so-import-pcap {% endif %} -{% if GLOBALS.role == 'so-heavynode' %} -remove_so-pcap-import_heavynode: - file.absent: - - name: /usr/sbin/so-pcap-import - -remove_so-import-pcap_heavynode: - file.absent: - - name: /usr/sbin/so-import-pcap -{% endif %} - -{% if not GLOBALS.is_manager%} -# prior to 2.4.50 these scripts were in common/tools/sbin on the manager because of soup and distributed to non managers -# these two states remove the scripts from non manager nodes -remove_soup: - file.absent: - - name: /usr/sbin/soup - -remove_so-firewall: - file.absent: - - name: /usr/sbin/so-firewall -{% endif %} - so-status_script: file.managed: - name: /usr/sbin/so-status diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls index beabb0e36..6b2f1551d 100644 --- a/salt/common/soup_scripts.sls +++ b/salt/common/soup_scripts.sls @@ -11,14 +11,6 @@ {% endif %} {% set SOVERSION = salt['file.read']('/etc/soversion').strip() %} -remove_common_soup: - file.absent: - - name: /opt/so/saltstack/default/salt/common/tools/sbin/soup - -remove_common_so-firewall: - file.absent: - - name: /opt/so/saltstack/default/salt/common/tools/sbin/so-firewall - # This section is used to put the scripts in place in the Salt file system # in case a state run tries to overwrite what we do in the next section. copy_so-common_common_tools_sbin: diff --git a/salt/curator/disabled.sls b/salt/curator/disabled.sls deleted file mode 100644 index 07346aa02..000000000 --- a/salt/curator/disabled.sls +++ /dev/null @@ -1,34 +0,0 @@ -# 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 -# https://securityonion.net/license; you may not use this file except in compliance with the -# Elastic License 2.0. - -so-curator: - docker_container.absent: - - force: True - -so-curator_so-status.disabled: - file.line: - - name: /opt/so/conf/so-status/so-status.conf - - match: ^so-curator$ - - mode: delete - -so-curator-cluster-close: - cron.absent: - - identifier: so-curator-cluster-close - -so-curator-cluster-delete: - cron.absent: - - identifier: so-curator-cluster-delete - -delete_curator_configuration: - file.absent: - - name: /opt/so/conf/curator - - recurse: True - -{% set files = salt.file.find(path='/usr/sbin', name='so-curator*') %} -{% if files|length > 0 %} -delete_curator_scripts: - file.absent: - - names: {{files|yaml}} -{% endif %} \ No newline at end of file diff --git a/salt/elasticsearch/config.sls b/salt/elasticsearch/config.sls index 38cd73ffc..701603efb 100644 --- a/salt/elasticsearch/config.sls +++ b/salt/elasticsearch/config.sls @@ -98,10 +98,6 @@ esrolesdir: - group: 939 - makedirs: True -eslibdir: - file.absent: - - name: /opt/so/conf/elasticsearch/lib - esingestdynamicconf: file.recurse: - name: /opt/so/conf/elasticsearch/ingest @@ -119,11 +115,6 @@ esingestconf: - group: 939 - show_changes: False -# Remove .fleet_final_pipeline-1 because we are using global@custom now -so-fleet-final-pipeline-remove: - file.absent: - - name: /opt/so/conf/elasticsearch/ingest/.fleet_final_pipeline-1 - # Auto-generate Elasticsearch ingest node pipelines from pillar {% for pipeline, config in ELASTICSEARCHMERGED.pipelines.items() %} es_ingest_conf_{{pipeline}}: diff --git a/salt/logstash/config.sls b/salt/logstash/config.sls index d3df0b20f..47feba42c 100644 --- a/salt/logstash/config.sls +++ b/salt/logstash/config.sls @@ -36,10 +36,6 @@ logstash: - gid: 931 - home: /opt/so/conf/logstash -lslibdir: - file.absent: - - name: /opt/so/conf/logstash/lib - logstash_sbin: file.recurse: - name: /usr/sbin diff --git a/salt/salt/master.sls b/salt/salt/master.sls index 6486e9126..895150cd7 100644 --- a/salt/salt/master.sls +++ b/salt/salt/master.sls @@ -23,15 +23,6 @@ sync_runners: - name: saltutil.sync_runners {% endif %} -# prior to 2.4.30 this engine ran on the manager with salt-minion -# this has changed to running with the salt-master in 2.4.30 -remove_engines_config: - file.absent: - - name: /etc/salt/minion.d/engines.conf - - source: salt://salt/files/engines.conf - - watch_in: - - service: salt_minion_service - checkmine_engine: file.managed: - name: /etc/salt/engines/checkmine.py diff --git a/salt/telegraf/ssl.sls b/salt/telegraf/ssl.sls index a21a0fc9f..c222f5cda 100644 --- a/salt/telegraf/ssl.sls +++ b/salt/telegraf/ssl.sls @@ -46,17 +46,6 @@ telegraf_key_perms: - mode: 640 - group: 939 -{% if not GLOBALS.is_manager %} -{# Prior to 2.4.210, minions used influxdb.crt and key for telegraf #} -remove_influxdb.crt: - file.absent: - - name: /etc/pki/influxdb.crt - -remove_influxdb.key: - file.absent: - - name: /etc/pki/influxdb.key -{% endif %} - {% else %} {{sls}}_state_not_allowed: