p34709852
/
monkey
forked from p15670423/monkey
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

appimage: Remove references to nonexistant island_logger_config.json

This commit is contained in:
Mike Salvatore 2021-05-12 13:12:40 -04:00
parent 1418671aa3
commit acc6f41a35
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
appimage/build_appimage.sh
View File

@ -166,7 +166,6 @@ copy_monkey_island_to_appdir() {
cp -r "$1"/common "$INSTALL_DIR/" cp -r "$1"/common "$INSTALL_DIR/"
cp -r "$1"/monkey_island "$INSTALL_DIR/" cp -r "$1"/monkey_island "$INSTALL_DIR/"
cp ./run_appimage.sh "$INSTALL_DIR"/monkey_island/linux/ 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/ 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 # TODO: This is a workaround that may be able to be removed after PR #848 is

9
appimage/run_appimage.sh
View File

@ -3,12 +3,6 @@
PYTHON_CMD="$APPDIR"/opt/python3.7/bin/python3.7 PYTHON_CMD="$APPDIR"/opt/python3.7/bin/python3.7
DOT_MONKEY="$HOME"/.monkey_island/ 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() { configure_default_server() {
if [ ! -f "$DOT_MONKEY"/server_config.json ]; then if [ ! -f "$DOT_MONKEY"/server_config.json ]; then
cp "$APPDIR"/usr/src/monkey_island/cc/server_config.json.standard "$DOT_MONKEY"/server_config.json 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 DB_DIR="$DOT_MONKEY"/db
mkdir --parents "$DB_DIR" mkdir --parents "$DB_DIR"
configure_default_logging
configure_default_server configure_default_server
cd "$APPDIR"/usr/src || exit 1 cd "$APPDIR"/usr/src || exit 1
./monkey_island/bin/mongodb/bin/mongod --dbpath "$DB_DIR" & ./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