Merge branch 'master' of https://github.com/toosmooth/securityonion-saltstack

salt/kibana/init.sls

@@ -59,7 +59,7 @@ synckibanacustom:
 # Start the kibana docker
 so-kibana:
   docker_container.running:
-    - image: soshybridhunter/so-kibana:HH1.0.3
+    - image: soshybridhunter/so-kibana:HH1.0.5
     - hostname: kibana
     - user: kibana
     - environment:

salt/mysql/etc/my.cnf

@@ -22,7 +22,7 @@ skip-name-resolve
 datadir=/var/lib/mysql
 socket=/var/lib/mysql/mysql.sock
 secure-file-priv=/var/lib/mysql-files
-user=939
+user=socore
 
 # Disabling symbolic-links is recommended to prevent assorted security risks
 symbolic-links=0

salt/mysql/init.sls

@@ -19,6 +19,13 @@ mysqletcdir:
     - group: 939
     - makedirs: True
 
+mysqlpiddir:
+  file.directory:
+    - name: /opt/so/conf/mysql/pid
+    - user: 939
+    - group: 939
+    - makedirs: True
+
 lsetcsync:
   file.recurse:
     - name: /opt/so/conf/mysql/etc

so-setup-network.sh

@@ -335,6 +335,10 @@ docker_install() {
     yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
     yum -y update
     yum -y install docker-ce docker-python python-docker
+    docker_registry
+    echo "Restarting Docker"
+    systemctl restart docker
+    systemctl enable docker
 
   else
     if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then