Merge branch 'dev' into feature/espillarz

This commit is contained in:
Mike Reeves
2020-07-10 11:35:12 -04:00
committed by GitHub
16 changed files with 89 additions and 37 deletions

View File

@@ -838,18 +838,6 @@ firewall_generate_templates() {
}
fleet_pillar() {
local pillar_file="$temp_install_dir"/pillar/minions/"$MINION_ID".sls
# Create the fleet pillar
printf '%s\n'\
"fleet:"\
" mainip: $MAINIP"\
" master: $MSRV"\
"" > "$pillar_file"
}
generate_passwords(){
# Generate Random Passwords for Things
MYSQLPASS=$(tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 20 | head -n 1)