Commit Graph

2411 Commits

Author SHA1 Message Date
Gonzalo Acuña
dd1ccf8680
Merge pull request #699 from wazuh/692-Fix-Agent-Template-to-Master
Fix sca agent template issue for day, wday and time parameters to Master
2022-01-17 09:48:30 -03:00
Gonzalo Acuña
f5339074b2
Merge pull request #698 from wazuh/692-Fix-Agent-Template-to-4.2
Fix sca agent template issue for day, wday and time parameters to 4.2
2022-01-17 09:47:51 -03:00
Gonzalo Acuña
14a295389e
Merge pull request #697 from wazuh/692-Fix-Agent-Template-to-4.3
Fix sca agent template issue for day, wday and time parameters to 4.3
2022-01-17 09:47:24 -03:00
Gonzalo Acuña
1e58febd33
Merge pull request #693 from wazuh/692-FixSCATemplateIssueto4.2
Fix sca template issue for day, wday and time parameters to 4.2
2022-01-17 09:46:20 -03:00
c-bordon
d89e0a6002
Fix agent sca template 2022-01-17 09:24:42 -03:00
c-bordon
e74d60d425
Fix agent sca template 2022-01-17 09:24:01 -03:00
c-bordon
c3c87f7470
Fix agent sca template 2022-01-17 09:23:09 -03:00
Alberto Rodríguez
91d28cfb94
Merge pull request #695 from wazuh/692-FixSCATemplateIssuetoMaster
Fix sca template issue for day, wday and time parameters to Master
2022-01-13 17:48:01 +01:00
Alberto Rodríguez
f879e9738e
Merge pull request #694 from wazuh/692-FixSCATemplateIssueto4.3
Fix sca template issue for day, wday and time parameters to 4.3
2022-01-13 17:47:39 +01:00
c-bordon
baff8be563
Fix sca template issue for day, wday and time parameters to Master 2021-12-30 16:20:25 -03:00
c-bordon
386000a708
Fix sca template issue for day, wday and time parameters to 4.3 2021-12-30 16:17:52 -03:00
c-bordon
627d1284f8
Fix sca template issue for day, wday and time parameters 2021-12-30 16:05:10 -03:00
Alberto Rodríguez
2763bb8e0c
Merge pull request #688 from wazuh/684-log4j
Disable log4j
2021-12-15 15:53:12 +01:00
Gonzalo Acuña
c9dcd763e9
disabledlog4j.options permissions update 2021-12-15 11:47:47 -03:00
Gonzalo Acuña
12cd6288d2
Log4j fix removed from jvm.options 2021-12-15 09:26:13 -03:00
Gonzalo Acuña
9c5a4651bb
Log4j fix added 2021-12-15 09:25:02 -03:00
Gonzalo Acuña
c6be0b2dcd
Disable log4j java option added 2021-12-14 17:11:41 -03:00
Alberto Rodríguez
fd5054cac9
Merge pull request #686 from wazuh/706-api-config
Api configuration options updated
2021-12-09 08:40:50 +01:00
Gonzalo Acuña
589fbebba6
Api configuration options updated 2021-12-03 15:38:04 -03:00
Alberto Rodríguez
a18e566029
Merge pull request #682 from wazuh/680-expect-fix-master
Expect tag deleted (master)
2021-12-03 12:19:36 +01:00
Alberto Rodríguez
3562feecb3
Merge pull request #683 from wazuh/680-expect-fix-4.3
Expect tag deleted (4.3)
2021-12-03 12:19:17 +01:00
Gonzalo Acuña
64a621ccf4
Fixes to include 4.2 changes 2021-12-02 15:32:24 -03:00
Gonzalo Acuña
8aab436b72
Fixes to include 4.2 changes 2021-12-02 15:28:06 -03:00
Gonzalo Acuña
5b82bd37f7
Fixes to include 4.2 changes 2021-12-02 15:19:06 -03:00
Gonzalo Acuña
30743cc036
Expect tag deleted 2021-12-02 10:12:18 -03:00
Gonzalo Acuña
f031f0fbfb
Expect tag deleted 2021-12-02 10:09:43 -03:00
Alberto Rodríguez
a38c64a7cd
Merge pull request #670 from Tinyblargon/master
Add missing dependancy (package) (user group)
2021-11-25 15:03:47 +01:00
dependabot[bot]
38d42d550e
Bump ansible from 2.9.5 to 4.2.0
Bumps [ansible](https://github.com/ansible/ansible) from 2.9.5 to 4.2.0.
- [Release notes](https://github.com/ansible/ansible/releases)
- [Commits](https://github.com/ansible/ansible/commits)

---
updated-dependencies:
- dependency-name: ansible
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-24 16:12:16 +00:00
dependabot[bot]
35524e5f6c
Bump pywin32 from 227 to 301
Bumps [pywin32](https://github.com/mhammond/pywin32) from 227 to 301.
- [Release notes](https://github.com/mhammond/pywin32/releases)
- [Changelog](https://github.com/mhammond/pywin32/blob/main/CHANGES.txt)
- [Commits](https://github.com/mhammond/pywin32/commits)

---
updated-dependencies:
- dependency-name: pywin32
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-24 16:12:01 +00:00
dependabot[bot]
6fb7e3d1dd
Bump pygments from 2.7.2 to 2.7.4
Bumps [pygments](https://github.com/pygments/pygments) from 2.7.2 to 2.7.4.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](https://github.com/pygments/pygments/compare/2.7.2...2.7.4)

---
updated-dependencies:
- dependency-name: pygments
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-24 16:11:56 +00:00
Alberto R
84291baa97
Bumped to 4.4.0 2021-11-24 17:10:24 +01:00
Gonzalo Acuña
0b8a1a7032
Merge pull request #669 from wazuh/625-authd-update-in-ossec-conf
Authd options update
2021-11-23 13:10:03 -03:00
Nicolas Lastra
f6b05e25da
fix var-ossec-etc-ossec-server.conf.j2, authd module and sub module force 2021-11-18 18:27:04 -03:00
tinyblargon
e5c4c4a8b6 Ensure group "wazuh" exists 2021-11-18 19:42:01 +01:00
tinyblargon
6358c4b8b6 Add gnupg to list of installed applications 2021-11-18 15:00:46 +01:00
Nicolas Lastra
2649a061c5
fix parameter value in Authd config 2021-11-17 15:34:43 -03:00
Nicolas Lastra
9534838714
authd-update-in-ossec-conf 2021-11-17 15:22:16 -03:00
Gonzalo Acuña
9f82175ab4
Merge pull request #667 from wazuh/665-tag4.2.5-to-master
Merge 4.2 into master (release v4.2.5)
2021-11-16 15:59:12 -03:00
Nicolas Lastra
bb95ea167c
merge 4.2.5 in master 2021-11-16 11:35:56 -03:00
José Fernández Aguilera
6ba251de85
Merge pull request #666 from wazuh/664-bump-4.2.5
Pre release v4.2.5 Ansible
2021-11-15 20:17:49 +01:00
Nicolas Lastra
a0116db707
bump 4.2.5 2021-11-15 11:26:56 -03:00
Gonzalo Acuña
2da0f98b33
Merge pull request #660 from wazuh/659-es-start-timeout
ES start timeout added
2021-10-28 15:10:27 -03:00
Gonzalo Acuña
8f6e102324
lineinfile module corrected 2021-10-28 15:01:49 -03:00
Gonzalo Acuña
04f3ec1aab
elasticsearch_start_timeout parameter added for OD installation 2021-10-28 14:36:40 -03:00
Gonzalo Acuña
60cc77f497
ES start timeout parameterized 2021-10-28 11:55:05 -03:00
Gonzalo Acuña
81a0cdb3f1
Merge pull request #654 from wazuh/645-tag4.2.4-to-master
Release 4.2.4 to master
2021-10-21 10:58:50 -03:00
Nicolas Lastra
f4ee80f10f
resolve merge conflicts 2021-10-21 10:36:00 -03:00
Nicolas Lastra
0d2d63271a
645-tag4.2.4-to-master 2021-10-20 18:02:37 -03:00
Gonzalo Acuña
b9a5ed744e
Merge pull request #652 from wazuh/644-fix-bump4.2.4
Fix bump 4.2.4
2021-10-19 16:31:26 -03:00
Nicolas Lastra
d9f894fd09
fix version 2021-10-19 16:23:39 -03:00