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

This commit addresses some of the issues in salt/salt-bootstrap#996:

Browse source 
1. Do not install sysutils/py-salt for GIT based installations. Instead it installs the dependencies and download service files from FreeBSD.

2. Remove /usr/local/etc/pkg/repos/saltstack.conf that is left over on the install process.
This commit is contained in:
Andres Montalban 2017-02-06 16:52:40 -03:00
parent 686d0ae9c7
commit c50cb57694
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
bootstrap-salt.sh
View file

@ -4851,6 +4851,9 @@ install_freebsd_11_stable_deps() {
install_freebsd_git_deps() {
install_freebsd_9_stable_deps || return 1
SALT_DEPENDENCIES=$(/usr/local/sbin/pkg search "${FROM_SALTSTACK}" -R -d sysutils/py-salt | grep -i origin | sed -e 's/^[[:space:]]*//' | tail -n +2 | awk -F\" '{print $2}' | tr '\n' ' ')
/usr/local/sbin/pkg install "${FROM_FREEBSD}" -y "${SALT_DEPENDENCIES}" || return 1
if ! __check_command_exists git; then
/usr/local/sbin/pkg install -y git || return 1
fi
@ -4926,15 +4929,6 @@ install_freebsd_11_stable() {
}
install_freebsd_git() {
# shellcheck disable=SC2086
/usr/local/sbin/pkg install ${FROM_SALTSTACK} -y sysutils/py-salt || return 1
# Let's keep the rc.d files before deleting the package
mkdir /tmp/rc-scripts || return 1
cp /usr/local/etc/rc.d/salt* /tmp/rc-scripts || return 1
# Let's delete the package
/usr/local/sbin/pkg delete -y sysutils/py-salt || return 1
# Install from git
if [ ! -f salt/syspaths.py ]; then
@ -4955,11 +4949,12 @@ install_freebsd_git() {
|| return 1
fi
# Restore the rc.d scripts
cp /tmp/rc-scripts/salt* /usr/local/etc/rc.d/ || return 1
# Delete our temporary scripts directory
rm -rf /tmp/rc-scripts || return 1
for script in salt_api salt_master salt_minion salt_proxy salt_syndic; do
__fetch_url "/usr/local/etc/rc.d/${script}" "https://raw.githubusercontent.com/freebsd/freebsd-ports/master/sysutils/py-salt/files/${script}.in" || return 1
sed -i '' 's/%%PREFIX%%/\/usr\/local/g' /usr/local/etc/rc.d/${script}
sed -i '' 's/%%PYTHON_CMD%%/\/usr\/local\/bin\/python2.7/g' /usr/local/etc/rc.d/${script}
chmod +x /usr/local/etc/rc.d/${script} || return 1
done
# And we're good to go
return 0
@ -4995,6 +4990,9 @@ install_freebsd_11_stable_post() {
}
install_freebsd_git_post() {
if [ -f $salt_conf_file ]; then
rm -f $salt_conf_file
fi
install_freebsd_9_stable_post || return 1
return 0
}