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

View File

@ -106,13 +106,13 @@ class Configuration(object):
########################### ###########################
# monkey config # monkey config
########################### ###########################
#sets whether or not the monkey is alive. if false will stop scanning and exploiting # sets whether or not the monkey is alive. if false will stop scanning and exploiting
alive = True alive = True
#sets whether or not to self delete the monkey executable when stopped # sets whether or not to self delete the monkey executable when stopped
self_delete_in_cleanup = False self_delete_in_cleanup = False
#string of the mutex name for single instance # string of the mutex name for single instance
singleton_mutex_name = "{2384ec59-0df8-4ab9-918c-843740924a28}" singleton_mutex_name = "{2384ec59-0df8-4ab9-918c-843740924a28}"
# how long to wait between scan iterations # how long to wait between scan iterations
@ -140,15 +140,11 @@ class Configuration(object):
"127.0.0.1:5000" "127.0.0.1:5000"
] ]
#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 # addresses of internet servers to ping and check if the monkey has internet acccess.
internet_services = ["monkey.guardicore.com", "www.google.com"] internet_services = ["monkey.guardicore.com", "www.google.com"]
=======
#addresses of internet servers to ping and check if the monkey has internet acccess.
internet_services = ["www.guardicore.com", "www.google.com"]
>>>>>>> origin/master
########################### ###########################
# scanners config # scanners config

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,