fix conflict

This commit is contained in:
Mike Reeves
2023-02-22 10:20:14 -05:00
104 changed files with 2331 additions and 1784 deletions

View File

@@ -23,10 +23,6 @@ docker:
- 0.0.0.0:514:514/udp
- 0.0.0.0:514:514/tcp
- 0.0.0.0:5066:5066/tcp
'so-grafana':
final_octet: 24
port_bindings:
- 0.0.0.0:3000:3000
'so-idstools':
final_octet: 25
'so-influxdb':
@@ -106,3 +102,5 @@ docker:
final_octet: 44
port_bindings:
- 0.0.0.0:8080:8080/tcp
'so-idh':
final_octet: 45