Skip to content

Main sync#22

Open
cyberd3ath wants to merge 19 commits intoEMCL-Research-ITSecLab:mainfrom
cyberd3ath:main-sync
Open

Main sync#22
cyberd3ath wants to merge 19 commits intoEMCL-Research-ITSecLab:mainfrom
cyberd3ath:main-sync

Conversation

@cyberd3ath
Copy link
Copy Markdown
Collaborator

Description

This pull request synchronizes the main branch with the lecture branch to resolve inconsistencies and code divergence that have accumulated due to past separate development. This includes identifying and merging missing commits, resolving conflicts, and ensuring both branches are aligned.

Fixes #20

Type of change

Please delete options that are not relevant.

  • [ x] Bug fix (non-breaking change which fixes an issue)
  • [ x] New feature (non-breaking change which adds functionality)

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration.

  • [x ] Fresh setup
  • [x ] Create challenge
  • [x ] Launch challenge
  • [x ] Test wazuh monitoring
  • [x ] Test challenge pool accuracy

Test Configuration:

  • OS: Ubuntu 22.04, VirtualBox 7.1.4
  • Proxmox Version: 9.1.1
  • Components affected: backend, init.sql, log_archiever, setup.py, gitignore

@cyberd3ath cyberd3ath requested a review from KunoVonHagen April 11, 2026 01:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[FEATURE] Sync main branch with lecture branch

2 participants