tyler.durden/lynis
1
0
Fork 0
mirror of https://github.com/CISOfy/lynis.git synced 2025-07-28 08:14:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code enhancements, improve detection for Puppet

Browse Source
This commit is contained in:
Michael Boelen 2017-10-29 10:52:42 +01:00
parent 331422384a
commit 764c18c218
No known key found for this signature in database
GPG Key ID: 26141F77A09D7F04
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/tests_tooling
View File

@ -88,8 +88,7 @@
Report "automation_tool_running[]=cf-agent" Report "automation_tool_running[]=cf-agent"
Display --indent 4 --text "- CFEngine (cf-agent)" --result "${STATUS_FOUND}" --color GREEN Display --indent 4 --text "- CFEngine (cf-agent)" --result "${STATUS_FOUND}" --color GREEN
fi fi
IsRunning "cf-server" if IsRunning "cf-server"; then
if [ ${RUNNING} -eq 1 ]; then
LogText "Result: found CFEngine server" LogText "Result: found CFEngine server"
AUTOMATION_TOOL_FOUND=1 AUTOMATION_TOOL_FOUND=1
CFENGINE_SERVER_RUNNING=1 CFENGINE_SERVER_RUNNING=1
@ -137,8 +136,7 @@
Display --indent 4 --text "- Puppet (agent)" --result "${STATUS_FOUND}" --color GREEN Display --indent 4 --text "- Puppet (agent)" --result "${STATUS_FOUND}" --color GREEN
fi fi
IsRunning "puppet master" if IsRunning --full "puppet master"; then
if [ ${RUNNING} -eq 1 ]; then
LogText "Result: found puppet master" LogText "Result: found puppet master"
AUTOMATION_TOOL_FOUND=1 AUTOMATION_TOOL_FOUND=1
PUPPET_MASTER_RUNNING=1 PUPPET_MASTER_RUNNING=1
@ -161,8 +159,7 @@
Report "automation_tool_running[]=saltstack-minion" Report "automation_tool_running[]=saltstack-minion"
Display --indent 4 --text "- SaltStack master (salt-master)" --result "${STATUS_FOUND}" --color GREEN Display --indent 4 --text "- SaltStack master (salt-master)" --result "${STATUS_FOUND}" --color GREEN
else else
IsRunning "salt-master" if IsRunning "salt-master"; then
if [ ${RUNNING} -eq 1 ]; then
LogText "Result: found SaltStack (master)" LogText "Result: found SaltStack (master)"
AUTOMATION_TOOL_FOUND=1 AUTOMATION_TOOL_FOUND=1
SALT_MASTER_RUNNING=1 SALT_MASTER_RUNNING=1
@ -335,8 +332,7 @@
Display --indent 2 --text "- Checking presence of Snort" --result "${STATUS_FOUND}" --color GREEN Display --indent 2 --text "- Checking presence of Snort" --result "${STATUS_FOUND}" --color GREEN
fi fi
IsRunning snort if IsRunning "snort"; then
if [ ${SNORT_RUNNING} -eq 1 ]; then
SNORT_FOUND=1 SNORT_FOUND=1
SNORT_RUNNING=1 SNORT_RUNNING=1
SNORT_LOG=$(${PSBINARY} | ${AWKBINARY} -F-.. '/snort/ {print $4}' | ${HEADBINARY} -1) SNORT_LOG=$(${PSBINARY} | ${AWKBINARY} -F-.. '/snort/ {print $4}' | ${HEADBINARY} -1)