From 705b242042bf84f93817d6c0d5c2e098d476dd9f Mon Sep 17 00:00:00 2001 From: dlee35 Date: Wed, 5 Dec 2018 08:05:08 -0500 Subject: [PATCH 1/3] Added docker_registry to centos and fixed service restart/enable --- so-setup-network.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/so-setup-network.sh b/so-setup-network.sh index 21179a18d..2d013c813 100644 --- a/so-setup-network.sh +++ b/so-setup-network.sh @@ -334,6 +334,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 From 51ffa32e6769f86d258e178fae5733b2f1d801c6 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 5 Dec 2018 11:09:40 -0500 Subject: [PATCH 2/3] MySQL Module - Change name to socore --- salt/mysql/etc/my.cnf | 2 +- salt/mysql/init.sls | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/salt/mysql/etc/my.cnf b/salt/mysql/etc/my.cnf index e1bf4e117..e37f690dc 100644 --- a/salt/mysql/etc/my.cnf +++ b/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 diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 1683a2a53..179727a5a 100644 --- a/salt/mysql/init.sls +++ b/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 From 314e35b2be1eb5ac64ee0b9a9eba44fc6b14112d Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 5 Dec 2018 11:10:34 -0500 Subject: [PATCH 3/3] Kibana Module - Added Dustin's dashboard mods --- salt/kibana/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls index b4b641862..4bd800297 100644 --- a/salt/kibana/init.sls +++ b/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: