CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9847 from Security-Onion-Solutions/somefixes

Browse Source
This commit is contained in:
Mike Reeves
2023-02-23 20:05:51 -05:00
committed by GitHub
parent 6141906b76 cd56d3a799
commit 663af7935b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/mysql/init.sls
View File

@@ -87,6 +87,8 @@ so-mysql:
- networks: - networks:
- sobridge: - sobridge:
- ipv4_address: {{ DOCKER.containers['so-mysql'].ip }} - ipv4_address: {{ DOCKER.containers['so-mysql'].ip }}
- extra_hosts:
- {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
- port_bindings: - port_bindings:
{% for BINDING in DOCKER.containers['so-mysql'].port_bindings %} {% for BINDING in DOCKER.containers['so-mysql'].port_bindings %}
- {{ BINDING }} - {{ BINDING }}
@@ -105,7 +107,7 @@ so-mysql:
- file: mysqlcnf - file: mysqlcnf
- file: mysqlpass - file: mysqlpass
cmd.run: cmd.run:
- name: until nc -z {{ GLOBALS.so_docker_bip }} 3306; do sleep 1; done - name: until nc -z {{ GLOBALS.manager }} 3306; do sleep 1; done
- timeout: 600 - timeout: 600
- onchanges: - onchanges:
- docker_container: so-mysql - docker_container: so-mysql

4
salt/playbook/init.sls
View File

@@ -85,8 +85,10 @@ so-playbook:
- ipv4_address: {{ DOCKER.containers['so-playbook'].ip }} - ipv4_address: {{ DOCKER.containers['so-playbook'].ip }}
- binds: - binds:
- /opt/so/log/playbook:/playbook/log:rw - /opt/so/log/playbook:/playbook/log:rw
- extra_hosts:
- {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
- environment: - environment:
- REDMINE_DB_MYSQL={{ DOCKER.containers['so-mysql'].ip }} - REDMINE_DB_MYSQL={{ GLOBALS.manager }}
- REDMINE_DB_DATABASE=playbook - REDMINE_DB_DATABASE=playbook
- REDMINE_DB_USERNAME=playbookdbuser - REDMINE_DB_USERNAME=playbookdbuser
- REDMINE_DB_PASSWORD={{ PLAYBOOKPASS }} - REDMINE_DB_PASSWORD={{ PLAYBOOKPASS }}