resolving conflicts

This commit is contained in:
vcerenu
2023-08-24 12:45:02 -03:00
15 changed files with 54 additions and 24 deletions
@@ -163,6 +163,14 @@
<update_interval>1h</update_interval>
</provider>
<!-- Alma Linux OS vulnerabilities -->
<provider name="almalinux">
<enabled>no</enabled>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>
<!-- Aggregate vulnerabilities -->
<provider name="nvd">
<enabled>yes</enabled>
@@ -366,4 +374,4 @@
<location>/var/log/dpkg.log</location>
</localfile>
</ossec_config>
</ossec_config>
@@ -157,6 +157,14 @@
<update_interval>1h</update_interval>
</provider>
<!-- Alma Linux OS vulnerabilities -->
<provider name="almalinux">
<enabled>no</enabled>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>
<!-- Windows OS vulnerabilities -->
<provider name="msu">
<enabled>yes</enabled>
@@ -366,4 +374,4 @@
<location>/var/log/dpkg.log</location>
</localfile>
</ossec_config>
</ossec_config>