search

CSIRT-MU / CRUSOE

CRUSOE: A Toolset for Cyber Situational Awareness and Decision Support in Incident Handling Inspired by the OODA Loop
MIT License
10 stars 5 forks source link

Merge automation #1

Closed husak closed 2 months ago

husak commented 2 months ago

merge the automation branch with main branch - automation branch contains numerous bugfixes and improvements by Vit Sebela that were created in gitlab and moved first into a separate branch instead of overwriting the repo as it is... there might be some conflicts

michal-cech commented 2 months ago

It seems that it was almost conflict-free. The only conflict was encountered in the crusoe_observe/ansible/roles/configuration/templates/conf.ini file. I still want to try to run the CRUSOE components locally (which seems not as straightforward) before I merge it to main to verify whether it is actually working, but there should not be any problems, assuming the deployment was updated correctly in the automation branch.

The intermediate state ready to be merged is in automation_main_rebase branch.

michal-cech commented 2 months ago

Well, it seems that the automation branch is broken. Compared to the author's repository https://gitlab.fi.muni.cz/xsebela3/CRUSOE it seems not all changes were put into this branch. The first major indicator was missing neo4j-rest-wrapper.conf file, which is required by the neo4j role here but was not copied to this repo. There were already small inconsistencies before. No Vagrant + Ansible finished correctly so far.

It seems merging the branches is not enough, I have to go through Vit Sebelas repository again and pick up the missing things and inconsistencies.

michal-cech commented 2 months ago

Merged to crusoe_update branch together with all other changes, will continue in a separate issue