aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-28 14:52:55 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-28 14:52:55 -0300
commitb83d85abc0678cbb0f63f793ce95339ba39406d6 (patch)
tree448bb223d1295d20047326b75c3b6d208e1d30e6
parent54c68a0572fcf356ad561f4784889299b1283d34 (diff)
downloadpuppet-bootstrap-b83d85abc0678cbb0f63f793ce95339ba39406d6.tar.gz
puppet-bootstrap-b83d85abc0678cbb0f63f793ce95339ba39406d6.tar.bz2
Check for puppet.conf on provision
-rwxr-xr-xbin/provision2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/provision b/bin/provision
index a3036c2..d67c960 100755
--- a/bin/provision
+++ b/bin/provision
@@ -29,7 +29,7 @@ if [ ! -h "/etc/puppet/hiera.yaml" ]; then
fi
# Link puppet configuration if needed.
-if [ ! -h "/etc/puppet/puppet.conf" ]; then
+if [ ! -h "/etc/puppet/puppet.conf" ] && [ -e "$DIRNAME/../puppet.conf" ]; then
$SUDO rm -f /etc/puppet/puppet.conf
$SUDO ln -s $DIRNAME/../puppet.conf /etc/puppet/puppet.conf
fi