diff --git a/docker/PYROS_DOCKER_RUN b/docker/PYROS_DOCKER_RUN index 4522792..185098d 100755 --- a/docker/PYROS_DOCKER_RUN +++ b/docker/PYROS_DOCKER_RUN @@ -1,6 +1,6 @@ #!/usr/bin/env bash -#if no container is running +# There should be 4 pyros* containers running if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] then echo "pyros-db or pyros weren't running, starting them..." @@ -9,11 +9,13 @@ fi echo "LOG files :" +# # 1) Web server +# # - Display log on current terminal #docker exec -it pyros python3 pyros.py start webserver $@ # - Save log in file -docker exec pyros python3 pyros.py -d start -o tnc webserver >> ../../LOG_PYROS_webserver.log 2>&1 & +docker exec pyros python3 pyros.py -d start -o tnc webserver > ../../LOG_PYROS_webserver.log 2>&1 & #docker exec pyros python3 pyros.py -d start -o guitalens webserver >> ../../LOG_PYROS_webserver.log 2>&1 & #docker exec pyros python3 pyros.py start webserver $@ > ../../LOG_PYROS_webserver.log 2>&1 & #docker exec pyros python3 pyros.py start -o tnc webserver >> ../../LOG_PYROS_webserver.log 2>&1 & @@ -25,14 +27,19 @@ echo "- Webserver LOG file is ../../LOG_PYROS_webserver.log" # Go on only if not "web" if [[ $1 != "web" ]] ; then +# # 2) PLC simulator +# # - Display log on current terminal #docker exec -it pyros bash -c "cd simulators/plc/ ; ./plcSimulator.py" # - Save log in file -docker exec pyros bash -c "cd simulators/plc/ ; ./plcSimulator.py" >> ../../LOG_PYROS_plc_simulator.log 2>&1 & +docker exec pyros bash -c "cd simulators/plc/ ; ./plcSimulator.py" > ../../LOG_PYROS_plc_simulator.log 2>&1 & echo "- PLC simulator LOG file is ../../LOG_PYROS_plc_simulator.log" -# 3) Agent Monitoring (AgentM) +# +# 3) AGENTS (according to TNC config) +# +# Agent Monitoring (AgentM) # - Display log on current terminal #docker exec -it pyros python3 pyros.py start agentM # - Save log in file @@ -41,7 +48,7 @@ docker exec pyros python3 pyros.py new-start -o tnc -fg >> ../../LOG_PYROS_agent # START ####docker exec pyros python3 pyros.py -d start agentM -o tnc >> ../../LOG_PYROS_agent_monitoring.log 2>&1 & #docker exec pyros python3 pyros.py -d start agentM -o "guitalens" >> ../../LOG_PYROS_agent_monitoring.log 2>&1 & -echo "- Agent Monitoring LOG file is ../../LOG_PYROS_agent_monitoring.log" +##echo "- Agent Monitoring LOG file is ../../LOG_PYROS_agent_monitoring.log" fi diff --git a/privatedev/config/tnc/observatory_tnc.yml b/privatedev/config/tnc/observatory_tnc.yml index 393a7b9..9d2a37d 100644 --- a/privatedev/config/tnc/observatory_tnc.yml +++ b/privatedev/config/tnc/observatory_tnc.yml @@ -426,7 +426,7 @@ OBSERVATORY: name: AgentBasic_irap computer: IRAP_SERVER protocol: private/plugin/agent/AgentBasic.py - is_active: False + is_active: True TOPOLOGY: -- libgit2 0.21.2