From 559b61b581634ff775addc593f245b2d98101f06 Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Tue, 25 May 2021 14:36:29 +0300 Subject: [PATCH] Removed code related to running mongodb and db folder creation --- deployment_scripts/deploy_windows.ps1 | 1 - monkey/monkey_island/linux/install_mongo.sh | 1 - monkey/monkey_island/windows/clear_db.bat | 4 ---- monkey/monkey_island/windows/run_mongodb.bat | 3 --- monkey/monkey_island/windows/run_server.bat | 4 +--- monkey/monkey_island/windows/run_server_py.bat | 2 -- 6 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 monkey/monkey_island/windows/clear_db.bat delete mode 100644 monkey/monkey_island/windows/run_mongodb.bat diff --git a/deployment_scripts/deploy_windows.ps1 b/deployment_scripts/deploy_windows.ps1 index 46f2fb0f4..9ce8480cb 100644 --- a/deployment_scripts/deploy_windows.ps1 +++ b/deployment_scripts/deploy_windows.ps1 @@ -176,7 +176,6 @@ function Deploy-Windows([String] $monkey_home = (Get-Item -Path ".\").FullName, } | Select-Object -ExpandProperty Name # Move all files from extracted folder to mongodb folder New-Item -ItemType directory -Path (Join-Path -Path $binDir -ChildPath "mongodb") - New-Item -ItemType directory -Path (Join-Path -Path $monkey_home -ChildPath $MONKEY_ISLAND_DIR | Join-Path -ChildPath "db") "Moving extracted files" Move-Item -Path (Join-Path -Path $binDir -ChildPath $mongodb_folder | Join-Path -ChildPath "\bin\*") -Destination (Join-Path -Path $binDir -ChildPath "mongodb\") "Removing zip file" diff --git a/monkey/monkey_island/linux/install_mongo.sh b/monkey/monkey_island/linux/install_mongo.sh index 2bf2d43d4..825daaf5a 100755 --- a/monkey/monkey_island/linux/install_mongo.sh +++ b/monkey/monkey_island/linux/install_mongo.sh @@ -58,7 +58,6 @@ popd || { } mkdir -p "${MONGODB_DIR}"/bin -mkdir -p "${MONGODB_DIR}"/db cp "${TEMP_MONGO}"/mongodb-*/bin/mongod "${MONGODB_DIR}"/bin/mongod cp "${TEMP_MONGO}"/mongodb-*/LICENSE-Community.txt "${MONGODB_DIR}"/ chmod a+x "${MONGODB_DIR}"/bin/mongod diff --git a/monkey/monkey_island/windows/clear_db.bat b/monkey/monkey_island/windows/clear_db.bat deleted file mode 100644 index 8597f3d32..000000000 --- a/monkey/monkey_island/windows/clear_db.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo Are you sure? (Press Any Key) -@pause -@rmdir /s /q db -@mkdir db \ No newline at end of file diff --git a/monkey/monkey_island/windows/run_mongodb.bat b/monkey/monkey_island/windows/run_mongodb.bat deleted file mode 100644 index 106b5f00a..000000000 --- a/monkey/monkey_island/windows/run_mongodb.bat +++ /dev/null @@ -1,3 +0,0 @@ -REM - Runs MongoDB Server - -@title MongoDB -@bin\mongodb\mongod.exe --dbpath db --bind_ip 127.0.0.1 \ No newline at end of file diff --git a/monkey/monkey_island/windows/run_server.bat b/monkey/monkey_island/windows/run_server.bat index ab2ad274c..5e5331a2e 100644 --- a/monkey/monkey_island/windows/run_server.bat +++ b/monkey/monkey_island/windows/run_server.bat @@ -1,5 +1,3 @@ REM - Runs MongoDB Server & Monkey Island Server using built pyinstaller EXE - -if not exist db mkdir db -start windows\run_mongodb.bat start windows\run_cc_exe.bat -start https://localhost:5000 \ No newline at end of file +start https://localhost:5000 diff --git a/monkey/monkey_island/windows/run_server_py.bat b/monkey/monkey_island/windows/run_server_py.bat index 90d81c9b7..a727211ea 100644 --- a/monkey/monkey_island/windows/run_server_py.bat +++ b/monkey/monkey_island/windows/run_server_py.bat @@ -1,5 +1,3 @@ REM - Runs MongoDB Server & Monkey Island Server using python - -if not exist db mkdir db -start windows\run_mongodb.bat pipenv run windows\run_cc.bat start https://localhost:5000