Skip to content

Commit

Permalink
update Vagrant box config and clean script
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Sjögren <[email protected]>
  • Loading branch information
konstruktoid committed Oct 13, 2023
1 parent 417bc93 commit a8606b5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 0 additions & 4 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Vagrant.configure("2") do |config|
"sshd_admin_net" => "0.0.0.0/0",
"sshd_allow_groups" => "vagrant sudo debian ubuntu",
"system_upgrade" => "no",
"install_aide" => "false"
}
end
end
Expand All @@ -43,7 +42,6 @@ Vagrant.configure("2") do |config|
"sshd_admin_net" => "0.0.0.0/0",
"sshd_allow_groups" => "vagrant sudo ubuntu",
"ansible_python_interpreter" => "/usr/bin/python3",
"install_aide" => "false"
}
end
end
Expand All @@ -63,7 +61,6 @@ Vagrant.configure("2") do |config|
"sshd_admin_net" => "0.0.0.0/0",
"sshd_allow_groups" => "vagrant sudo ubuntu",
"ansible_python_interpreter" => "/usr/bin/python3",
"install_aide" => "false"
}
end
end
Expand All @@ -86,7 +83,6 @@ Vagrant.configure("2") do |config|
"sshd_admin_net" => "0.0.0.0/0",
"sshd_allow_groups" => "vagrant sudo",
"ansible_python_interpreter" => "/usr/bin/python3",
"install_aide" => "false"
}
end
end
Expand Down
6 changes: 4 additions & 2 deletions runTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ if [ "$1" == "vagrant" ]; then

curl -sSL https://raw.githubusercontent.com/konstruktoid/ansible-role-hardening/master/defaults/main/suid_sgid_blocklist.yml | grep ' - ' >> "$(date +%y%m%d)-suid.list"

if command -v dos2unix; then
dos2unix ./*.list
fi

printf '\n\n'

find ./ -name '*-lynis.log' -type f | while read -r f; do
Expand All @@ -127,8 +131,6 @@ if [ "$1" == "vagrant" ]; then
grep 'not ok' ./*-bats.log | sed 's/-.*:/: /g' | sort -r | uniq > "$(date +%y%m%d)-not-ok.log"

else

molecule test || exit 1

echo "Tested with Ansible version: $ANSIBLE_V0"
fi

0 comments on commit a8606b5

Please sign in to comment.