From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 28 Mar 2016 17:52:55 +0000 (-0300)
Subject: Check for puppet.conf on provision
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b83d85abc0678cbb0f63f793ce95339ba39406d6;p=puppet-bootstrap.git

Check for puppet.conf on provision
---

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