From d9e63880f6ebd41c0991603543ff0cff2dd81fe1 Mon Sep 17 00:00:00 2001
From: David Lindquist <david.lindquist@hulu.com>
Date: Mon, 7 Jan 2013 19:20:10 -0800
Subject: [PATCH] Place minion keys in minion sub-directory if it exists

---
 bootstrap-salt-minion.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/bootstrap-salt-minion.sh b/bootstrap-salt-minion.sh
index 95004b5..ffefd63 100755
--- a/bootstrap-salt-minion.sh
+++ b/bootstrap-salt-minion.sh
@@ -858,14 +858,21 @@ config_minion() {
     # Copy the minions configuration if found
     [ -f "$TEMP_CONFIG_DIR/minion" ] && mv "$TEMP_CONFIG_DIR/minion" /etc/salt
 
+    PKI_DIR=/etc/salt/pki
+
+    # Minion keys moved to minion directory in Salt 0.11.0
+    if [[ -d $PKI_DIR/minion ]]; then
+        PKI_DIR=$PKI_DIR/minion
+    fi
+
     # Copy the minion's keys if found
     if [ -f "$TEMP_CONFIG_DIR/minion.pem" ]; then
-        mv "$TEMP_CONFIG_DIR/minion.pem" /etc/salt/pki
-        chmod 400 /etc/salt/pki/minion.pem
+        mv "$TEMP_CONFIG_DIR/minion.pem" $PKI_DIR/
+        chmod 400 $PKI_DIR/minion.pem
     fi
     if [ -f "$TEMP_CONFIG_DIR/minion.pub" ]; then
-        mv "$TEMP_CONFIG_DIR/minion.pub" /etc/salt/pki
-        chmod 664 /etc/salt/pki/minion.pub
+        mv "$TEMP_CONFIG_DIR/minion.pub" $PKI_DIR/
+        chmod 664 $PKI_DIR/minion.pub
     fi
 }
 #