From e91aa751a79dd2a201be526df0766d8d4822b604 Mon Sep 17 00:00:00 2001 From: weslambert Date: Fri, 17 Jul 2020 09:38:43 -0400 Subject: [PATCH 1/5] Change verbiage --- salt/wazuh/files/agent/ossec.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/wazuh/files/agent/ossec.conf b/salt/wazuh/files/agent/ossec.conf index 37971aa93..8d38868ef 100644 --- a/salt/wazuh/files/agent/ossec.conf +++ b/salt/wazuh/files/agent/ossec.conf @@ -6,7 +6,7 @@ {%- set ip = salt['pillar.get']('sensor:mainip', '') %} {%- endif %} From 6f077e66e6400b82010d36b3999e9677a20ae117 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 17 Jul 2020 10:05:54 -0400 Subject: [PATCH 2/5] dont try to copy schedules if the directory is empty --- setup/so-functions | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 0bbc013b2..8c2c18d2a 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -465,7 +465,9 @@ copy_minion_tmp_files() { ssh -i /root/.ssh/so.key soremote@"$MSRV" mkdir -p /tmp/"$MINION_ID"/pillar; ssh -i /root/.ssh/so.key soremote@"$MSRV" mkdir -p /tmp/"$MINION_ID"/schedules; scp -prv -i /root/.ssh/so.key "$temp_install_dir"/pillar/minions/* soremote@"$MSRV":/tmp/"$MINION_ID"/pillar/; - scp -prv -i /root/.ssh/so.key "$temp_install_dir"/salt/patch/os/schedules/* soremote@"$MSRV":/tmp/"$MINION_ID"/schedules; + if [ "$(ls -A $temp_install_dir/salt/patch/os/schedules/)" ]; then + scp -prv -i /root/.ssh/so.key "$temp_install_dir"/salt/patch/os/schedules/* soremote@"$MSRV":/tmp/"$MINION_ID"/schedules; + fi ssh -i /root/.ssh/so.key soremote@"$MSRV" sudo $default_salt_dir/salt/manager/files/add_minion.sh "$MINION_ID"; } >> "$setup_log" 2>&1 ;; From 2541f4d8e8aff3f896a525e8d0d55f825bfc484c Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 17 Jul 2020 10:23:51 -0400 Subject: [PATCH 3/5] dont try to copy schedules if the directory is empty --- setup/so-functions | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 8c2c18d2a..b159f286f 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -465,8 +465,10 @@ copy_minion_tmp_files() { ssh -i /root/.ssh/so.key soremote@"$MSRV" mkdir -p /tmp/"$MINION_ID"/pillar; ssh -i /root/.ssh/so.key soremote@"$MSRV" mkdir -p /tmp/"$MINION_ID"/schedules; scp -prv -i /root/.ssh/so.key "$temp_install_dir"/pillar/minions/* soremote@"$MSRV":/tmp/"$MINION_ID"/pillar/; - if [ "$(ls -A $temp_install_dir/salt/patch/os/schedules/)" ]; then - scp -prv -i /root/.ssh/so.key "$temp_install_dir"/salt/patch/os/schedules/* soremote@"$MSRV":/tmp/"$MINION_ID"/schedules; + if [ -d "$temp_install_dir"/salt/patch/os/schedules/ ]; then + if [ "$(ls -A $temp_install_dir/salt/patch/os/schedules/)" ]; then + scp -prv -i /root/.ssh/so.key "$temp_install_dir"/salt/patch/os/schedules/* soremote@"$MSRV":/tmp/"$MINION_ID"/schedules; + fi fi ssh -i /root/.ssh/so.key soremote@"$MSRV" sudo $default_salt_dir/salt/manager/files/add_minion.sh "$MINION_ID"; } >> "$setup_log" 2>&1 From 6e4eb7639344046f9ac00abc8b6621114a24a3ab Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Fri, 17 Jul 2020 10:25:48 -0400 Subject: [PATCH 4/5] Eval Ubuntu Fleet fix --- salt/ssl/init.sls | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index a0780ecf6..efa3032dc 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -142,6 +142,7 @@ regkeyperms: - signing_policy: managerssl - public_key: /etc/pki/managerssl.key - CN: {{ manager }} + - subjectAltName: DNS:{{ HOSTNAME }}, IP:{{ MAINIP }} {% if CUSTOM_FLEET_HOSTNAME != None %},DNS:{{ CUSTOM_FLEET_HOSTNAME }} {% endif %} - days_remaining: 0 - days_valid: 820 - backup: True @@ -289,4 +290,4 @@ fleetkeyperms: - mode: 640 - group: 939 -{% endif %} +{% endif %} \ No newline at end of file From 17e3bde2f828357e4a8c491bd55d2a551a3557e1 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Jul 2020 10:55:30 -0400 Subject: [PATCH 5/5] Create home dir for adduser function --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index b159f286f..cb7345abb 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -79,7 +79,7 @@ so_add_user() { echo "Add $username user" >> "$setup_log" 2>&1 groupadd --gid "$gid" "$username" - useradd --uid "$uid" --gid "$gid" --home-dir "$home_dir" "$username" + useradd -m --uid "$uid" --gid "$gid" --home-dir "$home_dir" "$username" # If a password has been passed in, set the password if [ "$pass" ]; then