From acc6f41a3576e489294671b4505677be330b8748 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Wed, 12 May 2021 13:12:40 -0400 Subject: [PATCH] appimage: Remove references to nonexistant island_logger_config.json --- appimage/build_appimage.sh | 1 - appimage/run_appimage.sh | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh index 866ba5a19..bce51bc89 100755 --- a/appimage/build_appimage.sh +++ b/appimage/build_appimage.sh @@ -166,7 +166,6 @@ copy_monkey_island_to_appdir() { cp -r "$1"/common "$INSTALL_DIR/" cp -r "$1"/monkey_island "$INSTALL_DIR/" cp ./run_appimage.sh "$INSTALL_DIR"/monkey_island/linux/ - cp ./island_logger_config.json "$INSTALL_DIR"/ cp ./server_config.json.standard "$INSTALL_DIR"/monkey_island/cc/ # TODO: This is a workaround that may be able to be removed after PR #848 is diff --git a/appimage/run_appimage.sh b/appimage/run_appimage.sh index 1c84b41f1..837ef5d3a 100644 --- a/appimage/run_appimage.sh +++ b/appimage/run_appimage.sh @@ -3,12 +3,6 @@ PYTHON_CMD="$APPDIR"/opt/python3.7/bin/python3.7 DOT_MONKEY="$HOME"/.monkey_island/ -configure_default_logging() { - if [ ! -f "$DOT_MONKEY"/island_logger_config.json ]; then - cp "$APPDIR"/usr/src/island_logger_config.json "$DOT_MONKEY" - fi -} - configure_default_server() { if [ ! -f "$DOT_MONKEY"/server_config.json ]; then cp "$APPDIR"/usr/src/monkey_island/cc/server_config.json.standard "$DOT_MONKEY"/server_config.json @@ -21,9 +15,8 @@ mkdir --mode=0700 --parents "$DOT_MONKEY" DB_DIR="$DOT_MONKEY"/db mkdir --parents "$DB_DIR" -configure_default_logging configure_default_server cd "$APPDIR"/usr/src || exit 1 ./monkey_island/bin/mongodb/bin/mongod --dbpath "$DB_DIR" & -${PYTHON_CMD} ./monkey_island.py --server-config "$DOT_MONKEY"/server_config.json --logger-config "$DOT_MONKEY"/island_logger_config.json +${PYTHON_CMD} ./monkey_island.py --server-config "$DOT_MONKEY"/server_config.json