[refactor] Use printf instead of echo to create multiline files

This commit is contained in:
William Wernert
2020-04-18 18:18:08 -04:00
parent 723d8f6f3f
commit a4267fd28b

View File

@@ -114,17 +114,16 @@ add_web_user() {
# Create an secrets pillar so that passwords survive re-install # Create an secrets pillar so that passwords survive re-install
secrets_pillar(){ secrets_pillar(){
if [ ! -f /opt/so/saltstack/pillar/secrets.sls ]; then if [ ! -f /opt/so/saltstack/pillar/secrets.sls ]; then
echo "Creating Secrets Pillar" >> "$SETUPLOG" 2>&1 echo "Creating Secrets Pillar" >> "$SETUPLOG" 2>&1
mkdir -p /opt/so/saltstack/pillar mkdir -p /opt/so/saltstack/pillar
echo "secrets:" >> /opt/so/saltstack/pillar/secrets.sls printf '%s\n'\
echo " mysql: $MYSQLPASS" >> /opt/so/saltstack/pillar/secrets.sls "secrets:"\
echo " fleet: $FLEETPASS" >> /opt/so/saltstack/pillar/secrets.sls " mysql: $MYSQLPASS"\
echo " fleet_jwt: $FLEETJWT" >> /opt/so/saltstack/pillar/secrets.sls " fleet: $FLEETPASS"\
echo " fleet_enroll-secret: False" >> /opt/so/saltstack/pillar/secrets.sls " fleet_jwt: $FLEETJWT"\
" fleet_enroll-secret: False" >> /opt/so/saltstack/pillar/secrets.sls
fi fi
} }
# Enable Bro Logs # Enable Bro Logs
@@ -139,44 +138,45 @@ bro_logs_enabled() {
echo " - $BLOG" | tr -d '"' >> pillar/brologs.sls echo " - $BLOG" | tr -d '"' >> pillar/brologs.sls
done done
else else
echo " - conn" >> pillar/brologs.sls printf '%s\n'\
echo " - dce_rpc" >> pillar/brologs.sls " - conn"\
echo " - dhcp" >> pillar/brologs.sls " - dce_rpc"\
echo " - dhcpv6" >> pillar/brologs.sls " - dhcp"\
echo " - dnp3" >> pillar/brologs.sls " - dhcpv6"\
echo " - dns" >> pillar/brologs.sls " - dnp3"\
echo " - dpd" >> pillar/brologs.sls " - dns"\
echo " - files" >> pillar/brologs.sls " - dpd"\
echo " - ftp" >> pillar/brologs.sls " - files"\
echo " - http" >> pillar/brologs.sls " - ftp"\
echo " - intel" >> pillar/brologs.sls " - http"\
echo " - irc" >> pillar/brologs.sls " - intel"\
echo " - kerberos" >> pillar/brologs.sls " - irc"\
echo " - modbus" >> pillar/brologs.sls " - kerberos"\
echo " - mqtt" >> pillar/brologs.sls " - modbus"\
echo " - notice" >> pillar/brologs.sls " - mqtt"\
echo " - ntlm" >> pillar/brologs.sls " - notice"\
echo " - openvpn" >> pillar/brologs.sls " - ntlm"\
echo " - pe" >> pillar/brologs.sls " - openvpn"\
echo " - radius" >> pillar/brologs.sls " - pe"\
echo " - rfb" >> pillar/brologs.sls " - radius"\
echo " - rdp" >> pillar/brologs.sls " - rfb"\
echo " - signatures" >> pillar/brologs.sls " - rdp"\
echo " - sip" >> pillar/brologs.sls " - signatures"\
echo " - smb_files" >> pillar/brologs.sls " - sip"\
echo " - smb_mapping" >> pillar/brologs.sls " - smb_files"\
echo " - smtp" >> pillar/brologs.sls " - smb_mapping"\
echo " - snmp" >> pillar/brologs.sls " - smtp"\
echo " - software" >> pillar/brologs.sls " - snmp"\
echo " - ssh" >> pillar/brologs.sls " - software"\
echo " - ssl" >> pillar/brologs.sls " - ssh"\
echo " - syslog" >> pillar/brologs.sls " - ssl"\
echo " - telnet" >> pillar/brologs.sls " - syslog"\
echo " - tunnel" >> pillar/brologs.sls " - telnet"\
echo " - weird" >> pillar/brologs.sls " - tunnel"\
echo " - mysql" >> pillar/brologs.sls " - weird"\
echo " - socks" >> pillar/brologs.sls " - mysql"\
echo " - x509" >> pillar/brologs.sls " - socks"\
" - x509" >> pillar/brologs.sls
fi fi
} }
@@ -689,23 +689,24 @@ fireeye_pillar() {
FIREEYEPILLARPATH=/opt/so/saltstack/pillar/fireeye FIREEYEPILLARPATH=/opt/so/saltstack/pillar/fireeye
mkdir -p "$FIREEYEPILLARPATH" mkdir -p "$FIREEYEPILLARPATH"
echo "" >> $FIREEYEPILLARPATH/init.sls printf '%s\n'\
echo "fireeye:" >> $FIREEYEPILLARPATH/init.sls "fireeye:"\
echo " helix:" >> $FIREEYEPILLARPATH/init.sls " helix:"\
echo " api_key: $HELIXAPIKEY" >> $FIREEYEPILLARPATH/init.sls " api_key: $HELIXAPIKEY"
"" > "$FIREEYEPILLARPATH"/init.sls
} }
fleet_pillar() { fleet_pillar() {
PILLARFILE=$TMP/pillar/minions/$MINION_ID.sls PILLARFILE="$TMP"/pillar/minions/"$MINION_ID".sls
# Create the fleet pillar # Create the fleet pillar
touch $PILLARFILE printf '%s\n'\
echo "fleet:" >> $PILLARFILE "fleet:"\
echo " mainip: $MAINIP" >> $PILLARFILE " mainip: $MAINIP"\
echo " master: $MSRV" >> $PILLARFILE " master: $MSRV"\
echo "" >> $PILLARFILE "" > "$PILLARFILE"
} }
generate_passwords(){ generate_passwords(){