From 759204e77b4128f83c409153a29db17c909f7b97 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 15 Apr 2020 15:37:59 -0400 Subject: [PATCH] Update Versions --- salt/common/init.sls | 2 +- salt/curator/init.sls | 2 +- salt/elastalert/init.sls | 2 +- salt/elasticsearch/init.sls | 2 +- salt/filebeat/init.sls | 2 +- salt/fleet/init.sls | 2 +- salt/hive/init.sls | 2 +- salt/idstools/init.sls | 2 +- salt/logstash/init.sls | 2 +- salt/master/init.sls | 2 +- salt/mysql/init.sls | 2 +- salt/pcap/init.sls | 2 +- salt/playbook/init.sls | 2 +- salt/redis/init.sls | 2 +- salt/sensoroni/init.sls | 2 +- salt/soctopus/init.sls | 2 +- salt/suricata/init.sls | 2 +- salt/tcpreplay/init.sls | 2 +- salt/wazuh/init.sls | 2 +- salt/zeek/init.sls | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index ac9e77409..181d86e4c 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -1,4 +1,4 @@ -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} {% set GRAFANA = salt['pillar.get']('master:grafana', '0') %} {% set FLEETMASTER = salt['pillar.get']('static:fleet_master', False) %} diff --git a/salt/curator/init.sls b/salt/curator/init.sls index e74bf2eb1..7912dfffa 100644 --- a/salt/curator/init.sls +++ b/salt/curator/init.sls @@ -1,4 +1,4 @@ -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} {% if grains['role'] == 'so-node' or grains['role'] == 'so-eval' %} # Curator diff --git a/salt/elastalert/init.sls b/salt/elastalert/init.sls index 599043d58..9d6e0f001 100644 --- a/salt/elastalert/init.sls +++ b/salt/elastalert/init.sls @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} {% if grains['role'] == 'so-master' %} diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls index 11284c830..f0127a651 100644 --- a/salt/elasticsearch/init.sls +++ b/salt/elasticsearch/init.sls @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} {% set FEATURES = salt['pillar.get']('elastic:features', False) %} {% if FEATURES %} diff --git a/salt/filebeat/init.sls b/salt/filebeat/init.sls index 12b429e51..3dd90338f 100644 --- a/salt/filebeat/init.sls +++ b/salt/filebeat/init.sls @@ -11,7 +11,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} {% set MASTERIP = salt['pillar.get']('static:masterip', '') %} {% set FEATURES = salt['pillar.get']('elastic:features', False) %} diff --git a/salt/fleet/init.sls b/salt/fleet/init.sls index 0a916ae3d..5dcc7e202 100644 --- a/salt/fleet/init.sls +++ b/salt/fleet/init.sls @@ -1,7 +1,7 @@ {%- set MYSQLPASS = salt['pillar.get']('secrets:mysql', None) -%} {%- set FLEETPASS = salt['pillar.get']('secrets:fleet', None) -%} {%- set FLEETJWT = salt['pillar.get']('secrets:fleet_jwt', None) -%} -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} {% set MAINIP = salt['pillar.get']('node:mainip') %} {% set FLEETARCH = salt['grains.get']('role') %} diff --git a/salt/hive/init.sls b/salt/hive/init.sls index 4b3b5b919..179ac5e1a 100644 --- a/salt/hive/init.sls +++ b/salt/hive/init.sls @@ -1,5 +1,5 @@ {% set MASTERIP = salt['pillar.get']('master:mainip', '') %} -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} hiveconfdir: file.directory: diff --git a/salt/idstools/init.sls b/salt/idstools/init.sls index 240796fda..f7ffacd6b 100644 --- a/salt/idstools/init.sls +++ b/salt/idstools/init.sls @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} # IDSTools Setup idstoolsdir: diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls index 9df9c0ca0..6488828e0 100644 --- a/salt/logstash/init.sls +++ b/salt/logstash/init.sls @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} {% set FEATURES = salt['pillar.get']('elastic:features', False) %} {% if FEATURES %} diff --git a/salt/master/init.sls b/salt/master/init.sls index 44ae2d75f..7752311f8 100644 --- a/salt/master/init.sls +++ b/salt/master/init.sls @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} {% set masterproxy = salt['pillar.get']('static:masterupdate', '0') %} diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 8c5b91b99..a8e47ca5b 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -1,6 +1,6 @@ {%- set MYSQLPASS = salt['pillar.get']('secrets:mysql', None) %} {%- set MASTERIP = salt['pillar.get']('static:masterip', '') %} -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} {% set MAINIP = salt['pillar.get']('node:mainip') %} {% set FLEETARCH = salt['grains.get']('role') %} diff --git a/salt/pcap/init.sls b/salt/pcap/init.sls index 9cfb2b68f..8f4f7d59a 100644 --- a/salt/pcap/init.sls +++ b/salt/pcap/init.sls @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} {% set INTERFACE = salt['pillar.get']('sensor:interface', 'bond0') %} {% set BPF_STENO = salt['pillar.get']('steno:bpf', None) %} diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls index 94638a64e..cb9c56d32 100644 --- a/salt/playbook/init.sls +++ b/salt/playbook/init.sls @@ -1,5 +1,5 @@ {% set MASTERIP = salt['pillar.get']('master:mainip', '') %} -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} playbookdb: diff --git a/salt/redis/init.sls b/salt/redis/init.sls index 2e6bd030c..c22838d7a 100644 --- a/salt/redis/init.sls +++ b/salt/redis/init.sls @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . {% set lsaccessip = salt['pillar.get']('master:lsaccessip', '') %} -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} # Redis Setup diff --git a/salt/sensoroni/init.sls b/salt/sensoroni/init.sls index b8d0b4e06..174687926 100644 --- a/salt/sensoroni/init.sls +++ b/salt/sensoroni/init.sls @@ -1,4 +1,4 @@ -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} sensoronidir: diff --git a/salt/soctopus/init.sls b/salt/soctopus/init.sls index 3ccf0dfa9..8ed4a514f 100644 --- a/salt/soctopus/init.sls +++ b/salt/soctopus/init.sls @@ -1,4 +1,4 @@ -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} soctopusdir: diff --git a/salt/suricata/init.sls b/salt/suricata/init.sls index da1220e63..f0b0f37c4 100644 --- a/salt/suricata/init.sls +++ b/salt/suricata/init.sls @@ -15,7 +15,7 @@ {% set interface = salt['pillar.get']('sensor:interface', 'bond0') %} {% set BROVER = salt['pillar.get']('static:broversion', '') %} -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} {% set BPF_NIDS = salt['pillar.get']('nids:bpf') %} {% set BPF_STATUS = 0 %} diff --git a/salt/tcpreplay/init.sls b/salt/tcpreplay/init.sls index bf80d9a10..d2e76aa8d 100644 --- a/salt/tcpreplay/init.sls +++ b/salt/tcpreplay/init.sls @@ -1,5 +1,5 @@ {% if grains['role'] == 'so-sensor' or grains['role'] == 'so-eval' %} -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} so-tcpreplay: diff --git a/salt/wazuh/init.sls b/salt/wazuh/init.sls index 4a6526c13..83c7cbc9a 100644 --- a/salt/wazuh/init.sls +++ b/salt/wazuh/init.sls @@ -1,5 +1,5 @@ {%- set HOSTNAME = salt['grains.get']('host', '') %} -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} # Add ossec group ossecgroup: diff --git a/salt/zeek/init.sls b/salt/zeek/init.sls index 1b0542900..16085fc3c 100644 --- a/salt/zeek/init.sls +++ b/salt/zeek/init.sls @@ -1,4 +1,4 @@ -{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} +{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.1') %} {% set MASTER = salt['grains.get']('master') %} {% set BPF_ZEEK = salt['pillar.get']('zeek:bpf', {}) %} {% set BPF_STATUS = 0 %}