From 20a3d31852c03177adc759b2f5fce7b578c6c2fd Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Tue, 16 Feb 2021 11:24:10 -0500 Subject: [PATCH] build: add data_dir to standard server config in appimage build --- deployment_scripts/appimage/build_appimage.sh | 5 +++-- deployment_scripts/appimage/server_config.json.standard | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 deployment_scripts/appimage/server_config.json.standard diff --git a/deployment_scripts/appimage/build_appimage.sh b/deployment_scripts/appimage/build_appimage.sh index d3a0fab47..b880a06d8 100755 --- a/deployment_scripts/appimage/build_appimage.sh +++ b/deployment_scripts/appimage/build_appimage.sh @@ -94,7 +94,7 @@ clone_monkey_repo() { fi log_message "Cloning files from git" - branch=${2:-"select-logger-config-at-runtime"} + branch=${2:-"data-dir"} git clone --single-branch --recurse-submodules -b "$branch" "${MONKEY_GIT_URL}" "${REPO_MONKEY_HOME}" 2>&1 || handle_error chmod 774 -R "${MONKEY_HOME}" @@ -107,10 +107,11 @@ copy_monkey_island_to_appdir() { cp -r $REPO_MONKEY_SRC/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 # merged. See monkey_island/cc/environment_singleton.py for more information. - cp $INSTALL_DIR/monkey_island/cc/server_config.json.standard $INSTALL_DIR/monkey_island/cc/server_config.json + cp ./server_config.json.standard $INSTALL_DIR/monkey_island/cc/server_config.json } install_monkey_island_python_dependencies() { diff --git a/deployment_scripts/appimage/server_config.json.standard b/deployment_scripts/appimage/server_config.json.standard new file mode 100644 index 000000000..99848f945 --- /dev/null +++ b/deployment_scripts/appimage/server_config.json.standard @@ -0,0 +1,5 @@ +{ + "server_config": "password", + "deployment": "standard", + "data_dir": "~/.monkey_island" +}