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

Setup Script - Fix Bugs in copy_minion_pillar

Browse Source
This commit is contained in:
Mike Reeves
2018-04-12 15:46:31 -04:00
parent bb5a0f25af
commit 788a713b01
1 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
so-setup-network.sh
View File

@@ -109,15 +109,9 @@ copy_minion_pillar() {
# Pass the type so it knows where to copy the pillar # Pass the type so it knows where to copy the pillar
local TYPE=$1 local TYPE=$1
if [ $TYPE = 'STORAGENODE' ]; then
PLOC="nodes"
else
PLOC="sensors"
fi
# Copy over the pillar # Copy over the pillar
echo "Copying the pillar over" echo "Copying the pillar over"
scp -i ~/.ssh/so.key /$TMP/$HOSTNAME.sls socore@$MSRV:/opt/so/saltstack/pillar/$PLOC/$HOSTNAME.sls scp -i ~/.ssh/so.key $TMP/$HOSTNAME.sls socore@$MSRV:/opt/so/saltstack/pillar/$TYPE/$HOSTNAME.sls
} }
@@ -324,18 +318,18 @@ master_static() {
node_pillar() { node_pillar() {
# Create the node pillar # Create the node pillar
touch /$TMP/$HOSTNAME.sls touch $TMP/$HOSTNAME.sls
echo "node:" > /$TMP/$HOSTNAME.sls echo "node:" > $TMP/$HOSTNAME.sls
echo " esaccessip: 127.0.0.1" >> /$TMP/$HOSTNAME.sls echo " esaccessip: 127.0.0.1" >> $TMP/$HOSTNAME.sls
echo " esheap: $NODEESHEAP" >> /$TMP/$HOSTNAME.sls echo " esheap: $NODEESHEAP" >> $TMP/$HOSTNAME.sls
echo " esclustername: {{ grains.host }}" >> /$TMP/$HOSTNAME.sls echo " esclustername: {{ grains.host }}" >> $TMP/$HOSTNAME.sls
echo " lsheap: $NODELSHEAP" >> /$TMP/$HOSTNAME.sls echo " lsheap: $NODELSHEAP" >> $TMP/$HOSTNAME.sls
echo " lsaccessip: 127.0.0.1" >> /$TMP/$HOSTNAME.sls echo " lsaccessip: 127.0.0.1" >> $TMP/$HOSTNAME.sls
echo " ls_pipeline_workers: $LSPIPELINEWORKERS" >> /$TMP/$HOSTNAME.sls echo " ls_pipeline_workers: $LSPIPELINEWORKERS" >> $TMP/$HOSTNAME.sls
echo " ls_pipeline_batch_size: $LSPIPELINEBATCH" >> /$TMP/$HOSTNAME.sls echo " ls_pipeline_batch_size: $LSPIPELINEBATCH" >> $TMP/$HOSTNAME.sls
echo " ls_input_threads: $LSINPUTTHREADS" >> /$TMP/$HOSTNAME.sls echo " ls_input_threads: $LSINPUTTHREADS" >> $TMP/$HOSTNAME.sls
echo " ls_batch_count: $LSINPUTBATCHCOUNT" >> /$TMP/$HOSTNAME.sls echo " ls_batch_count: $LSINPUTBATCHCOUNT" >> $TMP/$HOSTNAME.sls
echo " es_shard_count: $SHARDCOUNT" >> /$TMP/$HOSTNAME.sls echo " es_shard_count: $SHARDCOUNT" >> $TMP/$HOSTNAME.sls
} }
@@ -820,8 +814,8 @@ if (whiptail_you_sure) then
copy_ssh_key copy_ssh_key
create_bond create_bond
saltify saltify
configure_minion sensors configure_minion SENSOR
copy_minion_pillar SENSORONLY copy_minion_pillar sensors
salt_checkin salt_checkin
# Accept the Salt Key # Accept the Salt Key
accept_salt_key_remote accept_salt_key_remote
@@ -844,8 +838,8 @@ if (whiptail_you_sure) then
copy_ssh_key copy_ssh_key
create_bond create_bond
saltify saltify
configure_minion sensors configure_minion sensor
copy_minion_pillar SENSORONLY copy_minion_pillar sensors
salt_checkin salt_checkin
accept_salt_key_local accept_salt_key_local
salt_checkin_message salt_checkin_message
@@ -876,7 +870,7 @@ if (whiptail_you_sure) then
saltify saltify
configure_minion node configure_minion node
node_pillar node_pillar
copy_minion_pillar STORAGENODE copy_minion_pillar nodes
salt_checkin salt_checkin
# Accept the Salt Key # Accept the Salt Key
accept_salt_key_remote accept_salt_key_remote