From 8cb2f2053bf3648b00ce023d68936398b3569323 Mon Sep 17 00:00:00 2001
From: Joseph Hall <perlhoser@gmail.com>
Date: Thu, 24 Jan 2013 13:23:33 -0700
Subject: [PATCH] Copy master configuration as well as minion

---
 bootstrap-salt-minion.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/bootstrap-salt-minion.sh b/bootstrap-salt-minion.sh
index 8976914..89ffa2f 100755
--- a/bootstrap-salt-minion.sh
+++ b/bootstrap-salt-minion.sh
@@ -907,14 +907,18 @@ config_minion() {
     fi
 
     PKI_DIR=/etc/salt/pki/minion
+    MASTER_PKI_DIR=/etc/salt/pki/master
 
     # Let's create the necessary directories
     [ -d /etc/salt ] || mkdir /etc/salt
     [ -d $PKI_DIR ] || mkdir -p $PKI_DIR && chmod 700 $PKI_DIR
+    [ -d $MASTER_PKI_DIR ] || mkdir -p $MASTER_PKI_DIR && chmod 700 $MASTER_PKI_DIR
 
     # Copy the minions configuration if found
     [ -f "$TEMP_CONFIG_DIR/minion" ] && mv "$TEMP_CONFIG_DIR/minion" /etc/salt
 
+    # Copy the masters configuration if found
+    [ -f "$TEMP_CONFIG_DIR/master" ] && mv "$TEMP_CONFIG_DIR/master" /etc/salt
 
     # Copy the minion's keys if found
     if [ -f "$TEMP_CONFIG_DIR/minion.pem" ]; then
@@ -925,6 +929,16 @@ config_minion() {
         mv "$TEMP_CONFIG_DIR/minion.pub" $PKI_DIR/
         chmod 664 $PKI_DIR/minion.pub
     fi
+
+    # Copy the master's keys if found
+    if [ -f "$TEMP_CONFIG_DIR/master.pem" ]; then
+        mv "$TEMP_CONFIG_DIR/master.pem" $MASTER_PKI_DIR/
+        chmod 400 $MASTER_PKI_DIR/master.pem
+    fi
+    if [ -f "$TEMP_CONFIG_DIR/master.pub" ]; then
+        mv "$TEMP_CONFIG_DIR/master.pub" $MASTER_PKI_DIR/
+        chmod 664 $MASTER_PKI_DIR/master.pub
+    fi
 }
 #
 #  Ended Default Configuration function