merge with 120 dev and fix conflicts

2026-02-12 10:13:40 +01:00 · 2025-01-23 10:56:48 -05:00
parent 9db3cd901c ca0c1170ab
commit 213df68d04
92 changed files with 3711 additions and 528531 deletions
--- a/salt/firewall/containers.map.jinja
+++ b/salt/firewall/containers.map.jinja
@@ -9,6 +9,7 @@
     'so-influxdb',
     'so-kibana',
     'so-kratos',
+     'so-hydra',
     'so-nginx',
     'so-redis',
     'so-soc',
@@ -30,6 +31,7 @@
     'so-kafka',
     'so-kibana',
     'so-kratos',
+     'so-hydra',
     'so-logstash',
     'so-nginx',
     'so-redis',
@@ -73,6 +75,7 @@
     'so-influxdb',
     'so-kibana',
     'so-kratos',
+     'so-hydra',
     'so-nginx',
     'so-soc'
 ] %}