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

[fix] Fix indentation on mysql init.sls + depend on mysql container for fleet

Browse Source
This commit is contained in:
William Wernert
2020-04-28 10:57:14 -04:00
parent 34ddc69bfe
commit 968e3189e7
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
salt/fleet/init.sls
View File

@@ -91,6 +91,7 @@ fleetdb:
- connection_pass: {{ MYSQLPASS }} - connection_pass: {{ MYSQLPASS }}
- require: - require:
- sls: mysql - sls: mysql
- cmd: so-mysql
fleetdbuser: fleetdbuser:
mysql_user.present: mysql_user.present:

6
salt/mysql/init.sls
View File

@@ -57,7 +57,6 @@ mysqldatadir:
- user: 939 - user: 939
- group: 939 - group: 939
- makedirs: True - makedirs: True
{% if MYSQLPASS == None %} {% if MYSQLPASS == None %}
mysql_password_none: mysql_password_none:
@@ -85,4 +84,9 @@ so-mysql:
- /opt/so/log/mysql:/var/log/mysql:rw - /opt/so/log/mysql:/var/log/mysql:rw
- watch: - watch:
- /opt/so/conf/mysql/etc - /opt/so/conf/mysql/etc
cmd.run:
- name: until nc -z localhost 3036; do sleep 1; done
- timeout: 120
- onchanges:
- docker_container: so-mysql
{% endif %} {% endif %}