Add files via upload

Author: giga-a

docker-compose-dev.yml

@@ -73,6 +73,7 @@ services:
 
   redis:
     image: redis
+    container_name: url-sandbox_redis
     command: redis-server --requirepass changeme_927dhgs810d712fxs1
     networks:
       - backend

docker-compose-test.yml

@@ -69,6 +69,7 @@ services:
 
   redis:
     image: redis
+    container_name: url-sandbox_redis
     command: redis-server --requirepass changeme_927dhgs810d712fxs1
     networks:
       - backend

run.sh

@@ -11,12 +11,9 @@ setup_requirements () {
 }
 
 wait_on_web_interface () {
-echo ''
 until $(curl --silent --head --fail http://127.0.0.1:8000 --output /dev/null); do
-echo -ne "\n\n[\033[47m\033[0;31mInitializing project in progress..\033[0m]\n\n"
 sleep 5
 done
-echo ''
 xdg-open http://127.0.0.1:8000/url/
 }
 
@@ -29,33 +26,50 @@ dev_project () {
 }
 
 stop_containers () {
-	sudo docker stop $(sudo docker ps -aq)
+	docker-compose -f docker-compose-test.yml down -v 2>/dev/null
+	docker-compose -f docker-compose-dev.yml down -v 2>/dev/null
+	docker stop $(docker ps | grep url-sandbox_ | awk '{print $1}') 2>/dev/null
+	docker kill $(docker ps | grep url-sandbox_ | awk '{print $1}') 2>/dev/null
 } 
 
 deploy_aws_project () {
 	echo "Will be added later on"
 }
 
 auto_configure_test () {
+	stop_containers
+	wait_on_web_interface & 
 	setup_requirements
 	test_project
+	stop_containers 
+	kill %% 2>/dev/null
 }
 
 auto_configure () {
+	stop_containers
+	wait_on_web_interface & 
 	setup_requirements
 	dev_project
+	stop_containers 
+	kill %% 2>/dev/null
 }
 
 if [[ "$1" == "auto_test" ]]; then
-	stop_containers
-	wait_on_web_interface & 
 	auto_configure_test
-	stop_containers 
 fi
 
 if [[ "$1" == "auto_configure" ]]; then
-	stop_containers
-	wait_on_web_interface & 
 	auto_configure
-	stop_containers 
-fi
+fi
+
+kill %% 2>/dev/null
+
+while read -p "`echo -e '\nChoose an option:\n1) Setup requirements (docker, docker-compose)\n2) Test the project (All servers and Sniffer)\n8) Run auto configuration\n9) Run auto test\n>> '`"; do
+  case $REPLY in
+    "1") setup_requirements;;
+    "2") test_project;;
+    "8") auto_configure;;
+    "9") auto_configure_test;;
+    *) echo "Invalid option";;
+  esac
+done

shared/settings.py

@@ -15,10 +15,10 @@
     "backend_key": "w9AMMSqmKo4gFfE3s!Ghy4cRbE]xiynWKJhoUN(!1IfsOpJ0Z1KypX2uXhfH(lsQQqQ92pvDobxBC_oc^3M,0EzuO2wGk9fzhO0aWpkzSA7WXf2kDKafLpevawhfxJa09=#OJmlCNJE9Fa107A@g1s", 
     "mongo_settings_host": "mongodb",
     "mongo_settings": "mongodb://changeme_9620eh26sfvka017fx:changeme_0cx821ncf7qg17ahx3@mongodb:27017/?authSource=admin",
-    "redis_settings": "redis://:changeme_927dhgs810d712fxs1@redis:6379/0",
+    "redis_settings": "redis://:changeme_927dhgs810d712fxs1@url-sandbox_redis:6379/0",
     "celery_settings": {
-        "celery_broker_url": "redis://:changeme_927dhgs810d712fxs1@redis:6379/0", 
-        "celery_result_backend": "redis://:changeme_927dhgs810d712fxs1@redis:6379/0", 
+        "celery_broker_url": "redis://:changeme_927dhgs810d712fxs1@url-sandbox_redis:6379/0", 
+        "celery_result_backend": "redis://:changeme_927dhgs810d712fxs1@url-sandbox_redis:6379/0", 
         "name": "tasks"
     }, 
     "url_timeout": 10,