From 27f7aa779dc50ce9879c26778e45e231f59fbdcd Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 5 Jul 2018 17:10:57 -0400 Subject: [PATCH] Master Module - Add a blank line --- salt/firewall/init.sls | 2 +- salt/master/files/registry/config.yml | 3 ++- so-setup-network.sh | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/salt/firewall/init.sls b/salt/firewall/init.sls index 5a91f3ebe..877032b17 100644 --- a/salt/firewall/init.sls +++ b/salt/firewall/init.sls @@ -161,4 +161,4 @@ enable_docker_user_fw_policy: iptables.append: - table: filter - chain: DOCKER-USER - - jump: DROP \ No newline at end of file + - jump: DROP diff --git a/salt/master/files/registry/config.yml b/salt/master/files/registry/config.yml index 4233e0bff..a43335361 100644 --- a/salt/master/files/registry/config.yml +++ b/salt/master/files/registry/config.yml @@ -20,4 +20,5 @@ health: interval: 10s threshold: 3 proxy: - remoteurl: https://registry-1.docker.io \ No newline at end of file + remoteurl: https://registry-1.docker.io + \ No newline at end of file diff --git a/so-setup-network.sh b/so-setup-network.sh index 4b8711c97..4e156dac6 100644 --- a/so-setup-network.sh +++ b/so-setup-network.sh @@ -137,7 +137,7 @@ copy_ssh_key() { cat /dev/zero | ssh-keygen -f ~/.ssh/so.key -t rsa -q -N "" chown -R $SUDO_USER:$SUDO_USER ~/.ssh #Copy the key over to the master - sudo ssh-copy-id -f -i ~/.ssh/so.key socore@$MSRV + ssh-copy-id -f -i ~/.ssh/so.key socore@$MSRV } @@ -521,7 +521,7 @@ set_initial_firewall_policy() { if [ $INSTALLTYPE == 'MASTERONLY' ]; then - echo " - $MAINIP" >> $POLICYPATH/minions.sls + printf " - $MAINIP\n" >> $POLICYPATH/minions.sls fi if [ $INSTALLTYPE == 'SENSORONLY' ]; then