Merge branch 'dev' into feature/setup-changes

This commit is contained in:
William Wernert
2020-07-01 16:24:55 -04:00
5 changed files with 36 additions and 38 deletions

View File

@@ -1367,7 +1367,7 @@ sensor_pillar() {
" mainint: $MNIC" >> "$pillar_file"
if [ "$NSMSETUP" = 'ADVANCED' ]; then
echo " bro_pins:" >> "$pillar_file"
echo " zeek_pins:" >> "$pillar_file"
for PIN in "${BROPINS[@]}"; do
PIN=$(echo "$PIN" | cut -d\" -f2)
echo " - $PIN" >> "$pillar_file"
@@ -1378,10 +1378,10 @@ sensor_pillar() {
echo " - $SPIN" >> "$pillar_file"
done
elif [ "$install_type" = 'HELIXSENSOR' ]; then
echo " bro_lbprocs: $lb_procs" >> "$pillar_file"
echo " zeek_lbprocs: $lb_procs" >> "$pillar_file"
echo " suriprocs: $lb_procs" >> "$pillar_file"
else
echo " bro_lbprocs: $BASICBRO" >> "$pillar_file"
echo " zeek_lbprocs: $BASICBRO" >> "$pillar_file"
echo " suriprocs: $BASICSURI" >> "$pillar_file"
fi
printf '%s\n'\