diff --git a/salt/wazuh/init.sls b/salt/wazuh/init.sls index 1f23423ad..d6130abb9 100644 --- a/salt/wazuh/init.sls +++ b/salt/wazuh/init.sls @@ -43,14 +43,6 @@ ossec: # - user: 945 # - group: 945 -# Add wazuh agent -wazuhpkgs: - pkg.installed: - - skip_suggestions: False - - pkgs: - - wazuh-agent: 3.10.2-1 - - update_holds: True - # Add Wazuh agent conf wazuhagentconf: file.managed: diff --git a/setup/so-functions b/setup/so-functions index 69b282961..af865789e 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1131,8 +1131,7 @@ saltify() { apt-key add "$temp_install_dir"/gpg/GPG-KEY-WAZUH >> "$setup_log" 2>&1 echo "deb http://repo.saltstack.com$py_ver_url_path/ubuntu/$ubuntu_version/amd64/archive/2019.2.5/ $OSVER main" > /etc/apt/sources.list.d/saltstack.list >> "$setup_log" 2>&1 echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list >> "$setup_log" 2>&1 - apt-mark hold wazuh-agent >> "$setup_log" 2>&1 - ;; + ;; esac apt-get update >> "$setup_log" 2>&1 set_progress_str 8 'Installing salt-minion & python modules' diff --git a/setup/so-setup b/setup/so-setup index 39fcae904..71f8af38d 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -424,6 +424,13 @@ export percentage=0 fi if [[ "$WAZUH" = 1 ]]; then + if [ $OS = 'centos' ]; then + yum -y install wazuh-agent-3.10.2-1 >> "$setup_log" 2>&1 + echo "exclude=wazuh-agent" >> /etc/yum.repos.d/wazuh.repo + else + apt-get -y install wazuh-agent=3.10.2-1 >> "$setup_log" 2>&1 + apt-mark hold wazuh-agent >> "$setup_log" 2>&1 + fi set_progress_str 75 "$(print_salt_state_apply 'wazuh')" salt-call state.apply -l info wazuh >> $setup_log 2>&1 fi diff --git a/setup/yum_repos/wazuh.repo b/setup/yum_repos/wazuh.repo index 1f75912ca..70d23ccdd 100644 --- a/setup/yum_repos/wazuh.repo +++ b/setup/yum_repos/wazuh.repo @@ -4,5 +4,4 @@ gpgkey=https://packages.wazuh.com/key/GPG-KEY-WAZUH enabled=1 name=Wazuh repository baseurl=https://packages.wazuh.com/3.x/yum/ -protect=1 -exclude=wazuh-agent \ No newline at end of file +protect=1 \ No newline at end of file