mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-07 01:32:47 +01:00
Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into dev
This commit is contained in:
@@ -17,7 +17,7 @@ influxconfdir:
|
|||||||
influxlogdir:
|
influxlogdir:
|
||||||
file.directory:
|
file.directory:
|
||||||
- name: /opt/so/log/influxdb
|
- name: /opt/so/log/influxdb
|
||||||
- dir_mode: 755
|
- dir_mode: 775
|
||||||
- user: 939
|
- user: 939
|
||||||
- group: 939
|
- group: 939
|
||||||
- makedirs: True
|
- makedirs: True
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ query_updatepluginurls:
|
|||||||
playbooklogdir:
|
playbooklogdir:
|
||||||
file.directory:
|
file.directory:
|
||||||
- name: /opt/so/log/playbook
|
- name: /opt/so/log/playbook
|
||||||
- dir_mode: 755
|
- dir_mode: 775
|
||||||
- user: 939
|
- user: 939
|
||||||
- group: 939
|
- group: 939
|
||||||
- makedirs: True
|
- makedirs: True
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ if [[ -f automation/$automation && $(basename $automation) == $automation ]]; th
|
|||||||
if [[ ! $is_iso ]]; then
|
if [[ ! $is_iso ]]; then
|
||||||
echo "Installing sshpass for automated testing." >> $setup_log 2>&1
|
echo "Installing sshpass for automated testing." >> $setup_log 2>&1
|
||||||
if [ "$OS" == ubuntu ]; then
|
if [ "$OS" == ubuntu ]; then
|
||||||
if wait_for_apt; then apt-get -y install sshpass >> $setup_log 2>&1
|
if wait_for_apt; then apt-get -y install sshpass >> $setup_log 2>&1; else exit 1; fi
|
||||||
else
|
else
|
||||||
yum -y install sshpass >> $setup_log 2>&1
|
yum -y install sshpass >> $setup_log 2>&1
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user