merge with 120 dev and fix conflicts

This commit is contained in:
m0duspwnens
2025-01-23 10:56:48 -05:00
92 changed files with 3711 additions and 528531 deletions
+1
View File
@@ -53,6 +53,7 @@
{%
do GLOBALS.update({
'application_urls': {
'hydra': 'http://' ~ GLOBALS.manager ~ ':4445/',
'kratos': 'http://' ~ GLOBALS.manager ~ ':4434/',
'elastic': 'https://' ~ GLOBALS.manager ~ ':9200/',
'influxdb': 'https://' ~ GLOBALS.manager ~ ':8086/'