diff options
Diffstat (limited to 'tulip/0002-tulip-services.patch')
| -rw-r--r-- | tulip/0002-tulip-services.patch | 51 |
1 files changed, 23 insertions, 28 deletions
diff --git a/tulip/0002-tulip-services.patch b/tulip/0002-tulip-services.patch index a4136e8..f012a8f 100644 --- a/tulip/0002-tulip-services.patch +++ b/tulip/0002-tulip-services.patch @@ -1,23 +1,34 @@ -From da7f3fbc8c99cb123a0e62bf7c102c1735dfaf56 Mon Sep 17 00:00:00 2001 +From c7ba613ad4b55c59ff0dbb05c774eccc526eef32 Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic <aleksa@vuckovic.cc> -Date: Sat, 18 Nov 2023 14:28:29 +0000 -Subject: [PATCH] tulip patch +Date: Thu, 4 Jul 2024 09:18:50 +0000 +Subject: [PATCH] services --- - services/api/configurations.py | 24 +++++++++++++++++------- - 1 file changed, 17 insertions(+), 7 deletions(-) + services/api/configurations.py | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/services/api/configurations.py b/services/api/configurations.py -index a39a800..ae37f0c 100755 +index 0dea4f4..032fdb4 100755 --- a/services/api/configurations.py +++ b/services/api/configurations.py -@@ -30,11 +30,21 @@ tick_length = os.getenv("TICK_LENGTH", 2*60*1000) - start_date = os.getenv("TICK_START", "2018-06-27T13:00+02:00") +@@ -31,11 +31,16 @@ start_date = os.getenv("TICK_START", "2018-06-27T13:00+02:00") mongo_host = os.getenv("TULIP_MONGO", "localhost:27017") + flag_regex = os.getenv("FLAG_REGEX", "[A-Z0-9]{31}=") mongo_server = f'mongodb://{mongo_host}/' --vm_ip = "10.10.3.1" -+vm_ip = "10.32.160.2" - +-vm_ip = os.getenv("VM_IP", "10.10.3.1") ++vm_ip = "10.60.24.1" ++ ++services = [{"ip": vm_ip, "port": 1337, "name": "inlook"}, ++ {"ip": vm_ip, "port": 8000, "name": "extcel"}, ++ {"ip": vm_ip, "port": 3000, "name": "CCForms"}, ++ {"ip": vm_ip, "port": 3001, "name": "CCForms"}, ++ {"ip": vm_ip, "port": 8443, "name": "ccalendar"}, ++ {"ip": vm_ip, "port": 9001, "name": "x"}, ++ {"ip": vm_ip, "port": 9002, "name": "x"}, ++ {"ip": vm_ip, "port": 9003, "name": "x"}, ++ {"ip": vm_ip, "port": 9004, "name": "x"}, ++ {"ip": vm_ip, "port": -1, "name": "other"}] + -services = [{"ip": vm_ip, "port": 9876, "name": "cc_market"}, - {"ip": vm_ip, "port": 80, "name": "maze"}, - {"ip": vm_ip, "port": 8080, "name": "scadent"}, @@ -25,22 +36,6 @@ index a39a800..ae37f0c 100755 - {"ip": vm_ip, "port": 1883, "name": "scadnet_bin"}, - {"ip": vm_ip, "port": -1, "name": "other"}] \ No newline at end of file -+services = [{"ip": vm_ip, "port": 2080, "name": "turingmachines"}, -+ {"ip": vm_ip, "port": 8000, "name": "DjangoBells"}, -+ {"ip": vm_ip, "port": 16379, "name": "redisbbq"}, -+ {"ip": vm_ip, "port": 8080, "name": "pasteable"}, -+ {"ip": vm_ip, "port": 30000, "name": "telework"}, -+ {"ip": vm_ip, "port": 24929, "name": "saassaassaassaas"}, -+ {"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"}, -+ {"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"}, -+ {"ip": vm_ip, "port": -1, "name": "other"}, -+ {"ip": vm_ip, "port": -1, "name": "other"}] -- -2.34.1 +2.25.1 |