fix version lock for wazuh

This commit is contained in:
m0duspwnens
2020-05-20 11:23:55 -04:00
parent 92c2222879
commit d4840d203c
5 changed files with 22 additions and 4 deletions

View File

@@ -1,7 +1,4 @@
include:
{% if grains.os == "CentOS" %}
- yum.packages
{% endif %}
- patch.needs_restarting
patch_os:

View File

@@ -11,6 +11,11 @@
base:
'os:CentOS':
- match: grain
- yum.packages
'*':
- salt
- docker

View File

@@ -43,6 +43,14 @@ ossec:
# - user: 945
# - group: 945
wazuhpkgs:
pkg.installed:
- skip_suggestions: False
- pkgs:
- wazuh-agent: 3.10.2-1
- hold: True
- update_holds: True
# Add Wazuh agent conf
wazuhagentconf:
file.managed:

View File

@@ -1,3 +1,7 @@
install_yum_utils:
pkg.installed:
- name: yum-utils
install_yum_versionlock:
pkg.installed:
- name: yum-plugin-versionlock

View File

@@ -354,7 +354,6 @@ fi
set_progress_str 22 'Generating CA and checking in'
salt_checkin >> $setup_log 2>&1
if [[ $is_master || $is_helix ]]; then
set_progress_str 25 'Configuring firewall'
set_initial_firewall_policy >> $setup_log 2>&1
@@ -379,6 +378,11 @@ fi
set_progress_str 62 "$(print_salt_state_apply 'firewall')"
salt-call state.apply -l info firewall >> $setup_log 2>&1
if [ $OS = 'centos' ]; then
set_progress_str 63 'Installing Yum utilities'
salt-call state.apply -l info yum.packages >> $setup_log 2>&1
fi
set_progress_str 63 "$(print_salt_state_apply 'common')"
salt-call state.apply -l info common >> $setup_log 2>&1