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

merge with dev and resolv conflicts

Browse Source
This commit is contained in:
m0duspwnens
2020-07-10 10:48:49 -04:00
parent 1f48dc765e
commit 0a1b5f29eb
4 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup/so-functions
View File

@@ -838,7 +838,6 @@ firewall_generate_templates() {
}
<<<<<<< HEAD
fleet_pillar() {
local pillar_file="$temp_install_dir"/pillar/minions/"$MINION_ID".sls
@@ -851,8 +850,6 @@ fleet_pillar() {
"" > "$pillar_file"
}
=======
>>>>>>> remotes/origin/dev
generate_passwords(){
# Generate Random Passwords for Things
MYSQLPASS=$(tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 20 | head -n 1)