| commit | fd3eded50e63b3face0bd37acd4545a266d5fb35 | [log] [tgz] |
|---|---|---|
| author | Petr Michalec <epcim@apealive.net> | Mon Oct 23 09:51:19 2017 +0200 |
| committer | GitHub <noreply@github.com> | Mon Oct 23 09:51:19 2017 +0200 |
| tree | c0b6c48c58301857b1e8534e2aca922c3e884e79 | |
| parent | e8ec5ac9e57d18504d0eff7fd0fd7aba51f762c7 [diff] | |
| parent | 3c30e7d745c40a03bbeb3d0d252575223aa53432 [diff] |
Merge pull request #24 from Projoke/patch-2 Add variable SCRIPTS
diff --git a/bootstrap.sh b/bootstrap.sh index eb9baa8..60c0c87 100755 --- a/bootstrap.sh +++ b/bootstrap.sh
@@ -568,6 +568,8 @@ pgrep salt-master | sed /$$/d | xargs --no-run-if-empty -i{} $SUDO kill -9 {} || true pkill -9 salt-minion + SCRIPTS=$(dirname $0) + test -e ${SCRIPTS}/.salt-master-setup.sh.passed || { export MASTER_IP=${MASTER_IP:-127.0.0.1} export MINION_ID=${MASTER_HOSTNAME}