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

Merge pull request #970 from eradman/freebsd

Browse source 
FreeBSD: set _SALT_ETC_DIR directory to match ports
This commit is contained in:
Nicole Thomas 2016-10-22 08:10:47 -06:00 • committed by GitHub
commit 5907c42f6f
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bootstrap-salt.sh
View file

@ -4497,6 +4497,8 @@ __configure_freebsd_pkg_details() {
}
install_freebsd_9_stable_deps() {
_SALT_ETC_DIR=${BS_SALT_ETC_DIR:-/usr/local/etc/salt}
_PKI_DIR=${_SALT_ETC_DIR}/pki
if [ $_DISABLE_REPOS -eq $BS_FALSE ]; then
#make variables available even if pkg already installed
@ -4587,11 +4589,6 @@ install_freebsd_git_deps() {
fi
echodebug "Finished patching"
# Set _SALT_ETC_DIR to ports default
_SALT_ETC_DIR=${BS_SALT_ETC_DIR:-/usr/local/etc/salt}
# We also need to redefine the PKI directory
_PKI_DIR=${_SALT_ETC_DIR}/pki
# Let's trigger config_salt()
if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
_TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"
@ -4619,13 +4616,6 @@ install_freebsd_11_stable() {
# shellcheck disable=SC2086
/usr/local/sbin/pkg install ${FROM_FREEBSD} -y sysutils/py-salt || return 1
#
# setting _SALT_ETC_DIR to match paths from FreeBSD ports:
#
_SALT_ETC_DIR=${BS_SALT_ETC_DIR:-/usr/local/etc/salt}
if [ ! -d /etc/salt ]; then
ln -sf "${_SALT_ETC_DIR}" /etc/salt
fi
return 0
}