Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes to make ossec.conf equivalent to the default version #190

Merged
merged 33 commits into from
Jan 8, 2020
Merged

Changes to make ossec.conf equivalent to the default version #190

merged 33 commits into from
Jan 8, 2020

Conversation

rshad
Copy link
Contributor

@rshad rshad commented Dec 19, 2019

Hi all!

This PR resolves #185.

Kr,

Rshad

rshad and others added 23 commits December 5, 2019 18:45
@rshad
Remove 'sca''s policies
e1fb115
@rshad
Remove sca policies - rhel
a510f94
@rshad
Parameterize wodle cis-cat template
b09acba
@rshad
Parameterize wodle osquery template
be95fef
@rshad
Merge remote-tracking branch 'origin/feature-185-default-installation…
96d1a29 
…' into feature-186-parameterize-templates
@rshad
Parameterize _ruleset temp. & Add needed param.
35a248e
@rshad
Parameterize wodle_syscollector.erb template
a883bcd
@rshad
Parameterize wodle_openscap.erb template
700bad2
@rshad
Parameterize _sca.erb template
d1a1057
@rshad
Adapt _sca template variables
e4ce176
@rshad
Adapt _sca template parameters - agent
ff767eb
@rshad
Add _sca parameters to agent & manager manifests
80f537b
@rshad
Put vulnerability_detector as wodle
d7eca41
Merge pull request #187 from wazuh/feature-186-parameterize-templates
cbf6955 
Parameterize templates
@rshad
Remove wodle_vulnerability_detector template
c5105ca
@rshad
Adapt ports tag config. in syscollector
e20d3ce
@rshad
Add vulnerability_detector template
a88db26
@rshad
Adapt ossec.conf - global => email config.
79936e5
@rshad
Add new variables. for vulnerability, email, ..
89bdaa2
@rshad
Add vulnerability_detector variables
34b004b
@rshad
Fix vulnerability-detector template
0776347
@rshad
Fix Indents and line spacing
59976c9
@rshad
Add new line in template
6a9722d
@rshad rshad changed the title Add changes to make ossec.conf equivalent to the default installation version Changes to make ossec.conf equivalent to the default version Dec 19, 2019
@rshad rshad changed the base branch from devel to master January 3, 2020 11:45
@rshad rshad changed the base branch from master to devel January 3, 2020 11:46
@rshad rshad changed the base branch from devel to wazuh-release-3.11.0_7.5.1 January 3, 2020 11:47
@rshad rshad changed the base branch from wazuh-release-3.11.0_7.5.1 to devel January 3, 2020 11:47
@rshad rshad marked this pull request as ready for review January 7, 2020 17:04
@rshad rshad self-assigned this Jan 7, 2020
@rshad rshad added this to the Sprint - 105 milestone Jan 7, 2020
@jm404
Copy link
Contributor

jm404 commented Jan 8, 2020

Linting fixed and pdk validate shows no error:

image

@jm404 jm404 merged commit 10d7d1e into devel Jan 8, 2020
@jm404 jm404 deleted the feature-185-default-installation branch January 8, 2020 07:54
@jm404 jm404 mentioned this pull request Jan 8, 2020
Closed
10 tasks
@rshad rshad mentioned this pull request Jan 23, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@rshad rshad

Labels
None yet
Projects
None yet
Milestone
Sprint - 105
Development

Successfully merging this pull request may close these issues.
2 participants
@rshad @jm404