From 2c3d0af3e360e4c2af01695f09163e15965fa170 Mon Sep 17 00:00:00 2001 From: itsikkes Date: Fri, 15 Jul 2016 17:00:55 +0300 Subject: [PATCH] merge fix --- chaos_monkey/config.py | 14 +++++--------- chaos_monkey/example.conf | 1 + 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/chaos_monkey/config.py b/chaos_monkey/config.py index 763bd2793..8f4ae841e 100644 --- a/chaos_monkey/config.py +++ b/chaos_monkey/config.py @@ -106,13 +106,13 @@ class Configuration(object): ########################### # 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 - #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 - #string of the mutex name for single instance + # string of the mutex name for single instance singleton_mutex_name = "{2384ec59-0df8-4ab9-918c-843740924a28}" # how long to wait between scan iterations @@ -140,15 +140,11 @@ class Configuration(object): "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 -<<<<<<< HEAD + # addresses of internet servers to ping and check if the monkey has internet acccess. 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 diff --git a/chaos_monkey/example.conf b/chaos_monkey/example.conf index 6aac82c1c..99288f91d 100644 --- a/chaos_monkey/example.conf +++ b/chaos_monkey/example.conf @@ -65,6 +65,7 @@ "singleton_mutex_name": "{2384ec59-0df8-4ab9-918c-843740924a28}", "skip_exploit_if_file_exist": true, "ssh_user": "root", + "local_network_scan": true, "tcp_scan_get_banner": true, "tcp_scan_interval": 200, "tcp_scan_timeout": 10000,