p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge fix

This commit is contained in:
itsikkes 2016-07-15 17:00:55 +03:00
parent c5fd92c570
commit 2c3d0af3e3
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chaos_monkey/config.py
View File

@ -143,12 +143,8 @@ class Configuration(object):
# sets whether or not to retry failed hosts on next scan # sets whether or not to retry failed hosts on next scan
retry_failed_explotation = True retry_failed_explotation = True
<<<<<<< HEAD
internet_services = ["monkey.guardicore.com", "www.google.com"]
=======
# addresses of internet servers to ping and check if the monkey has internet acccess. # addresses of internet servers to ping and check if the monkey has internet acccess.
internet_services = ["www.guardicore.com", "www.google.com"] internet_services = ["monkey.guardicore.com", "www.google.com"]
>>>>>>> origin/master
########################### ###########################
# scanners config # scanners config

1
chaos_monkey/example.conf
View File

@ -65,6 +65,7 @@
"singleton_mutex_name": "{2384ec59-0df8-4ab9-918c-843740924a28}", "singleton_mutex_name": "{2384ec59-0df8-4ab9-918c-843740924a28}",
"skip_exploit_if_file_exist": true, "skip_exploit_if_file_exist": true,
"ssh_user": "root", "ssh_user": "root",
"local_network_scan": true,
"tcp_scan_get_banner": true, "tcp_scan_get_banner": true,
"tcp_scan_interval": 200, "tcp_scan_interval": 200,
"tcp_scan_timeout": 10000, "tcp_scan_timeout": 10000,