From 0cd9709b826e3b212bd31c8af54583a8dbadb19b Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Thu, 3 Jun 2021 20:12:27 -0400 Subject: [PATCH] island: Remove server_config.json.develop Since Monkey Island no longer writes to server_config.json in the source code directory, and each package will overwrite server_config.json with its own server config (until we separate the deployment from the config in issue #1205), we no longer need server_config.json.develop and we don't need to worry about accidentally committing credentials to git. --- .travis.yml | 3 --- .../cc/{server_config.json.develop => server_config.json} | 0 monkey/monkey_island/cc/server_utils/consts.py | 4 ---- 3 files changed, 7 deletions(-) rename monkey/monkey_island/cc/{server_config.json.develop => server_config.json} (100%) diff --git a/.travis.yml b/.travis.yml index 6654cc3af..b54e7d2cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,6 @@ python: os: linux -before_install: -# Init server_config.json to default -- cp monkey/monkey_island/cc/server_config.json.develop monkey/monkey_island/cc/server_config.json install: # Python diff --git a/monkey/monkey_island/cc/server_config.json.develop b/monkey/monkey_island/cc/server_config.json similarity index 100% rename from monkey/monkey_island/cc/server_config.json.develop rename to monkey/monkey_island/cc/server_config.json diff --git a/monkey/monkey_island/cc/server_utils/consts.py b/monkey/monkey_island/cc/server_utils/consts.py index 3de221647..357e2bc8e 100644 --- a/monkey/monkey_island/cc/server_utils/consts.py +++ b/monkey/monkey_island/cc/server_utils/consts.py @@ -40,9 +40,5 @@ DEFAULT_SERVER_CONFIG_PATH = os.path.expandvars( os.path.join(MONKEY_ISLAND_ABS_PATH, "cc", SERVER_CONFIG_FILENAME) ) -DEFAULT_DEVELOP_SERVER_CONFIG_PATH = os.path.join( - MONKEY_ISLAND_ABS_PATH, "cc", f"{SERVER_CONFIG_FILENAME}.develop" -) - DEFAULT_LOG_LEVEL = "INFO" DEFAULT_START_MONGO_DB = True