]> gitweb.fluxo.info Git - puppet-bootstrap.git/commitdiff
Check for puppet.conf on provision
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 28 Mar 2016 17:52:55 +0000 (14:52 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 28 Mar 2016 17:52:55 +0000 (14:52 -0300)
bin/provision

index a3036c2150beeb8aadc67e1e72cdc8f1ed95d86b..d67c9600929eecc46ddaa4c5355d2dd48412f0a1 100755 (executable)
@@ -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