afmarulanda/wazuh-ansible-4.8.1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflicts resolution

Browse Source
This commit is contained in:
Gonzalo Acuña 2023-05-18 12:18:53 -03:00
parent 08e8412a75
commit 3e8a69bb37
No known key found for this signature in database
GPG Key ID: 646BA79A313A2270
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
roles/wazuh/ansible-wazuh-agent/defaults/main.yml
View File

@ -1,10 +1,5 @@
--- ---
<<<<<<< HEAD
wazuh_agent_version: 4.4.2
=======
wazuh_agent_version: 4.5.0 wazuh_agent_version: 4.5.0
>>>>>>> 4.5
# Custom packages installation # Custom packages installation
@ -16,11 +11,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""
wazuh_agent_sources_installation: wazuh_agent_sources_installation:
enabled: false enabled: false
<<<<<<< HEAD
branch: "v4.4.2"
=======
branch: "v4.5.0" branch: "v4.5.0"
>>>>>>> 4.5
user_language: "y" user_language: "y"
user_no_stop: "y" user_no_stop: "y"
user_install_type: "agent" user_install_type: "agent"