diff options
| author | Aleksa Vuckovic <aleksa@vuckovic.cc> | 2024-08-31 14:16:47 +0200 |
|---|---|---|
| committer | Aleksa Vuckovic <aleksa@vuckovic.cc> | 2024-08-31 14:16:47 +0200 |
| commit | 43c02fe25e7931a3c56445a5279ee723b27564ec (patch) | |
| tree | 1282b6d5e15272bef6c2f043f441f318bb87677a | |
| parent | 4d74e075aea9a26ac420ed10ffaa4258b6397ce8 (diff) | |
| -rw-r--r-- | tulip/0002-tulip-services.patch | 16 | ||||
| -rw-r--r-- | tulip/tulip.env | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tulip/0002-tulip-services.patch b/tulip/0002-tulip-services.patch index 1e0564f..a0314f1 100644 --- a/tulip/0002-tulip-services.patch +++ b/tulip/0002-tulip-services.patch @@ -16,15 +16,15 @@ index 0dea4f4..032fdb4 100755 flag_regex = os.getenv("FLAG_REGEX", "[A-Z0-9]{31}=") mongo_server = f'mongodb://{mongo_host}/' -vm_ip = os.getenv("VM_IP", "10.10.3.1") -+vm_ip = "10.100.2.1" ++vm_ip = "10.60.33.1" + -+services = [{"ip": vm_ip, "port": 5000, "name": "contractual_service1"}, -+ {"ip": vm_ip, "port": 1337, "name": "tpm_service2"}, -+ {"ip": vm_ip, "port": 3000, "name": "todo_service3"}, -+ {"ip": vm_ip, "port": -1, "name": "other"}, -+ {"ip": vm_ip, "port": -1, "name": "other"}, -+ {"ip": vm_ip, "port": -1, "name": "other"}, -+ {"ip": vm_ip, "port": -1, "name": "other"}, ++services = [{"ip": vm_ip, "port": 80, "name": "CApp"}, ++ {"ip": vm_ip, "port": 1234, "name": "CyberUni"}, ++ {"ip": vm_ip, "port": 1235, "name": "CyberUni"}, ++ {"ip": vm_ip, "port": 1236, "name": "CyberUni"}, ++ {"ip": vm_ip, "port": 1237, "name": "CyberUni"}, ++ {"ip": vm_ip, "port": 1337, "name": "TiCCket"}, ++ {"ip": vm_ip, "port": 5000, "name": "Trademark"}, + {"ip": vm_ip, "port": -1, "name": "other"}, + {"ip": vm_ip, "port": -1, "name": "other"}, + {"ip": vm_ip, "port": -1, "name": "other"}, diff --git a/tulip/tulip.env b/tulip/tulip.env index c853c57..91fdb0e 100644 --- a/tulip/tulip.env +++ b/tulip/tulip.env @@ -14,7 +14,7 @@ TRAFFIC_DIR_DOCKER=/traffic ############################## # Start time of the CTF (or network open if you prefer) -TICK_START="2024-08-31T10:00+02:00" +TICK_START="2024-08-31T14:00+02:00" # Tick length in ms TICK_LENGTH=120000 # The flag format in regex @@ -41,5 +41,5 @@ FLAG_REGEX="[A-Z0-9]{31}=" # # Flagid endpoint currently Testendpoint in docker compose # FLAGID_ENDPOINT="http://flagidendpoint:8000/flagids.json" # # VM IP (inside gamenet) -VM_IP="10.100.2.1" -TEAM_ID="10.100.2.1" +VM_IP="10.60.33.1" +TEAM_ID="10.60.33.1" |