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

Deprecate config_freebsd_salt() function, there is no purpose for it

Browse source
This commit is contained in:
Denys Havrysh 2016-03-02 11:50:54 +02:00
parent ccdd294dec
commit a719022410
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bootstrap-salt.sh
View file

@ -4204,17 +4204,6 @@ install_freebsd_11_stable_deps() {
install_freebsd_9_stable_deps
}
config_freebsd_salt() {
# 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
config_salt || return 1
return 0
}
install_freebsd_git_deps() {
install_freebsd_9_stable_deps || return 1
@ -4265,7 +4254,12 @@ install_freebsd_git_deps() {
# Let's trigger config_salt()
if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
_TEMP_CONFIG_DIR="${__SALT_GIT_CHECKOUT_DIR}/conf/"
CONFIG_SALT_FUNC="config_freebsd_salt"
CONFIG_SALT_FUNC="config_salt"
# 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
fi
return 0