saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

When passing the configuration directory, fail as soon as possible.

Browse source
This commit is contained in:
Pedro Algarvio 2013-02-11 22:11:00 +00:00
parent 1cbcb11aa5
commit b24df9d74a
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bootstrap-salt.sh
View file

@ -138,7 +138,13 @@ do
v ) echo "$0 -- Version $ScriptVersion"; exit 0 ;;
n ) COLORS=0; __detect_color_support ;;
D ) ECHO_DEBUG=$BS_TRUE ;;
c ) TEMP_CONFIG_DIR="$OPTARG" ;;
c ) TEMP_CONFIG_DIR="$OPTARG"
# If the configuration directory does not exist, error out
if [ ! -d "$TEMP_CONFIG_DIR" ]; then
echoerror "The configuration directory ${TEMP_CONFIG_DIR} does not exist."
exit 1
fi
;;
M ) INSTALL_MASTER=$BS_TRUE ;;
S ) INSTALL_SYNDIC=$BS_TRUE ;;
N ) INSTALL_MINION=$BS_FALSE ;;
@ -1522,17 +1528,14 @@ install_smartos_start_daemons() {
# the -c options is passed.
#
config_salt() {
CONFIGURED_ANYTHING=$BS_FALSE
# If the configuration directory is not passed, return
[ "$TEMP_CONFIG_DIR" = "null" ] && return
# If the configuration directory does not exist, error out
if [ ! -d "$TEMP_CONFIG_DIR" ]; then
echoerror "The configuration directory ${TEMP_CONFIG_DIR} does not exist."
exit 1
fi
CONFIGURED_ANYTHING=$BS_FALSE
SALT_DIR=/etc/salt
PKI_DIR=$SALT_DIR/pki
# Let's create the necessary directories
[ -d $SALT_DIR ] || mkdir $SALT_DIR
[ -d $PKI_DIR ] || mkdir -p $PKI_DIR && chmod 700 $PKI_DIR