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

Merge pull request #9619 from Security-Onion-Solutions/kilo

Browse Source 
switch MySQL 8 to use native password for playbook compat; fix so-verify mail inspection
This commit is contained in:
Jason Ertel
2023-01-23 15:14:00 -05:00
committed by GitHub
parent 1039e77550 5a016312f6
commit 5da1b03d9b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
salt/mysql/etc/my.cnf
View File

@@ -29,3 +29,6 @@ symbolic-links=0
log-error=/var/log/mysql/mysqld.log log-error=/var/log/mysql/mysqld.log
pid-file=/var/run/mysqld/mysqld.pid pid-file=/var/run/mysqld/mysqld.pid
# Switch back to the native password module so that playbook can connect
default_authentication_plugin=mysql_native_password

5
setup/so-verify
View File

@@ -17,7 +17,7 @@ using_iso() {
if [ "$setup_type" == "iso" ]; then if [ "$setup_type" == "iso" ]; then
return 0 return 0
fi fi
return 0 return 1
} }
# Check entire setup log for errors or unexpected salt states # Check entire setup log for errors or unexpected salt states
@@ -54,7 +54,8 @@ log_has_errors() {
# For ISO installs, we know nothing else can be running on this server, so there should be # For ISO installs, we know nothing else can be running on this server, so there should be
# nothing in any mail spool dir. # nothing in any mail spool dir.
cron_error_in_mail_spool() { cron_error_in_mail_spool() {
if find /var/spool/mail/ -type f -size +0 &> /dev/null; then count=$(find /var/spool/mail/ -type f -size +0 | wc -l)
if [[ $count -ne 0 ]]; then
return 0 return 0
fi fi
return 1 return 1