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

[fix] Simplify if statements and apply mine.update during setup

Browse Source
This commit is contained in:
William Wernert
2020-06-16 08:38:50 -04:00
parent 0961fe7091
commit 0c9c7002dc
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup/so-functions
View File

@@ -223,18 +223,17 @@ check_network_manager_conf() {
local nmconf="/etc/NetworkManager/NetworkManager.conf" local nmconf="/etc/NetworkManager/NetworkManager.conf"
local preupdir="/etc/NetworkManager/dispatcher.d/pre-up.d" local preupdir="/etc/NetworkManager/dispatcher.d/pre-up.d"
if test -f "$gmdconf"; then if test -f "$gmdconf" && ! test -f "${gmdconf}.bak"; then
if ! test -f "${gmdconf}.bak"; then
{ {
mv "$gmdconf" "${gmdconf}.bak" mv "$gmdconf" "${gmdconf}.bak"
touch "$gmdconf" touch "$gmdconf"
systemctl restart NetworkManager systemctl restart NetworkManager
} >> "$setup_log" 2>&1 } >> "$setup_log" 2>&1
fi fi
fi
if test -f "$nmconf"; then if test -f "$nmconf"; then
sed -i 's/managed=false/managed=true/g' "$nmconf" >> "$setup_log" 2>&1 sed -i 's/managed=false/managed=true/g' "$nmconf" >> "$setup_log" 2>&1
systemctl restart NetworkManager >> "$setup_log" 2>&1
fi fi
if [[ ! -d "$preupdir" ]]; then if [[ ! -d "$preupdir" ]]; then
@@ -1239,8 +1238,9 @@ salt_checkin() {
cat /etc/pki/ca.crt cat /etc/pki/ca.crt
echo " Applyng a mine hack"; echo " Applyng a mine hack";
salt '*' mine.send x509.get_pem_entries glob_path=/etc/pki/ca.crt; salt '*' mine.send x509.get_pem_entries glob_path=/etc/pki/ca.crt;
echo " Confirming salt mine now contain the certificate" salt '*' mine.update;
salt \* mine.get \* x509.get_pem_entries echo " Confirming salt mine now contain the certificate";
salt '*' mine.get '*' x509.get_pem_entries;
echo " Applying SSL state"; echo " Applying SSL state";
salt-call state.apply ssl; salt-call state.apply ssl;
} >> "$setup_log" 2>&1 } >> "$setup_log" 2>&1