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

Multiple Slat Fixes

Browse Source
This commit is contained in:
Mike Reeves
2018-04-25 16:02:04 -04:00
parent 7d88fd4410
commit dab2137c10
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/logstash/init.sls
View File

@@ -87,8 +87,8 @@ lslogdir:
so-logstash: so-logstash:
docker_container.running: docker_container.running:
- image: toosmooth/so-logstash:test2 - image: toosmooth/so-logstash:test2
- hostname: logstash - hostname: so-logstash
- name: logstash - name: so-logstash
- user: logstash - user: logstash
- environment: - environment:
- LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }} - LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }}

7
salt/redis/init.sls
View File

@@ -29,6 +29,13 @@ redisworkdir:
- group: 939 - group: 939
- makedirs: True - makedirs: True
redislogdir:
file.directory:
- name: /opt/so/log/redis
- user: 939
- group: 939
- makedirs: True
redisconfsync: redisconfsync:
file.recurse: file.recurse:
- name: /opt/so/conf/redis/etc - name: /opt/so/conf/redis/etc

17
so-setup-network.sh
View File

@@ -300,8 +300,8 @@ master_pillar() {
echo " ls_pipeline_workers: $CPUCORES" >> /opt/so/saltstack/pillar/masters/$HOSTNAME.sls echo " ls_pipeline_workers: $CPUCORES" >> /opt/so/saltstack/pillar/masters/$HOSTNAME.sls
echo " nids_rules: $RULESETUP" >> /opt/so/saltstack/pillar/masters/$HOSTNAME.sls echo " nids_rules: $RULESETUP" >> /opt/so/saltstack/pillar/masters/$HOSTNAME.sls
echo " oinkcode: $OINKCODE" >> /opt/so/saltstack/pillar/masters/$HOSTNAME.sls echo " oinkcode: $OINKCODE" >> /opt/so/saltstack/pillar/masters/$HOSTNAME.sls
echo " access_key: \x22$ACCESS_KEY\x22" >> /opt/so/saltstack/pillar/masters/$HOSTNAME.sls echo " access_key: $ACCESS_KEY" >> /opt/so/saltstack/pillar/masters/$HOSTNAME.sls
echo " access_secret: \x22$ACCESS_SECRET\x22" >> /opt/so/saltstack/pillar/masters/$HOSTNAME.sls echo " access_secret: $ACCESS_SECRET" >> /opt/so/saltstack/pillar/masters/$HOSTNAME.sls
} }
@@ -754,6 +754,8 @@ if (whiptail_you_sure) then
# Let folks know they need their management interface already set up. # Let folks know they need their management interface already set up.
whiptail_network_notice whiptail_network_notice
# Go ahead and gen the keys so we can use them for any sensor type
minio_generate_keys
# What kind of install are we doing? # What kind of install are we doing?
whiptail_install_type whiptail_install_type
@@ -777,21 +779,22 @@ if (whiptail_you_sure) then
# Last Chance to back out # Last Chance to back out
whiptail_make_changes whiptail_make_changes
# Add the user so we can sit back and relax
echo ""
echo "**** Please set a password for socore. You will use this password when setting up other Nodes/Sensors"
echo ""
add_socore_user_master
# Install salt and dependencies # Install salt and dependencies
saltify saltify
configure_minion master configure_minion master
install_master install_master
salt_master_directories salt_master_directories
echo ""
echo "**** Please set a password for socore. You will use this password when setting up other Nodes/Sensors"
echo ""
add_socore_user_master
update_sudoers update_sudoers
chown_salt_master chown_salt_master
es_heapsize es_heapsize
ls_heapsize ls_heapsize
master_static master_static
minio_generate_keys
echo "generating the master pillar" echo "generating the master pillar"
master_pillar master_pillar
# Do a checkin to push the key up # Do a checkin to push the key up