CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add Redis pillar and fix idstools

Browse Source
This commit is contained in:
Mike Reeves
2020-09-30 15:08:44 -04:00
parent 5b16a65422
commit 7314e2dea8
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
salt/common/tools/sbin/soup
View File

@@ -251,6 +251,9 @@ rc3_to_2.3.0() {
if [ ! -f /etc/profile.d/securityonion.sh ]; then if [ ! -f /etc/profile.d/securityonion.sh ]; then
echo "complete -cf sudo" > /etc/profile.d/securityonion.sh echo "complete -cf sudo" > /etc/profile.d/securityonion.sh
fi fi
# Add Redis settings to global pillar
echo "redis_settings:" >> /opt/so/saltstack/local/pillar/global.sls
" redis_maxmemory: 827" >> /opt/so/saltstack/local/pillar/global.sls
} }
space_check() { space_check() {

18
salt/idstools/etc/rulecat.conf
View File

@@ -17,16 +17,16 @@
--disable=/opt/so/idstools/etc/disable.conf --disable=/opt/so/idstools/etc/disable.conf
--enable=/opt/so/idstools/etc/enable.conf --enable=/opt/so/idstools/etc/enable.conf
--modify=/opt/so/idstools/etc/modify.conf --modify=/opt/so/idstools/etc/modify.conf
{%- if RULESET == 'ETOPEN' -%} {%- if RULESET == 'ETOPEN' %}
--etopen --etopen
{%- elif RULESET == 'ETPRO' -%} {%- elif RULESET == 'ETPRO' %}
--etpro={{ OINKCODE }} --etpro={{ OINKCODE }}
{%- elif RULESET == 'TALOS' -%} {%- elif RULESET == 'TALOS' %}
--url=https://www.snort.org/rules/snortrules-snapshot-2983.tar.gz?oinkcode={{ OINKCODE }} --url=https://www.snort.org/rules/snortrules-snapshot-2983.tar.gz?oinkcode={{ OINKCODE }}
{%- endif -%} {%- endif %}
{%- endif -%} {%- endif %}
{%- if URLS != None -%} {%- if URLS != None %}
{%- for URL in URLS -%} {%- for URL in URLS %}
--url={{ URL }} --url={{ URL }}
{%- endfor -%} {%- endfor %}
{%- endif -%} {%- endif %}

4
salt/redis/etc/redis.conf
View File

@@ -1,3 +1,5 @@
{% set MAXMEM = salt['pillar.get']('redis_settings:redis_maxmemory', 812) %}
# Redis configuration file example. # Redis configuration file example.
# #
# Note that in order to read the configuration file, Redis must be # Note that in order to read the configuration file, Redis must be
@@ -858,7 +860,7 @@ acllog-max-len 128
# limit for maxmemory so that there is some free RAM on the system for replica # limit for maxmemory so that there is some free RAM on the system for replica
# output buffers (but this is not needed if the policy is 'noeviction'). # output buffers (but this is not needed if the policy is 'noeviction').
# #
maxmemory 817m maxmemory {{ MAXMEM }}m
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
# is reached. You can select one from the following behaviors: # is reached. You can select one from the following behaviors:

3
setup/so-functions
View File

@@ -1273,6 +1273,9 @@ manager_global() {
" playbook:"\ " playbook:"\
" rulesets:"\ " rulesets:"\
" - windows" >> "$global_pillar" " - windows" >> "$global_pillar"
"redis_settings:"\
" redis_maxmemory: 812"\
printf '%s\n' '----' >> "$setup_log" 2>&1 printf '%s\n' '----' >> "$setup_log" 2>&1
} }