From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 1 Oct 2014 16:34:05 +0000 (-0300)
Subject: Squashed 'puppet/' changes from 2979f23..c652a9c
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c1af9eeeaef30150c33ff5c262998bf4b3744e14;p=debian.git

Squashed 'puppet/' changes from 2979f23..c652a9c

c652a9c Provision: link puppet config

git-subtree-dir: puppet
git-subtree-split: c652a9c12f00d8b2bc589165c33709e887e807c7
---

diff --git a/bin/provision b/bin/provision
index 7fa056b..61acf59 100755
--- a/bin/provision
+++ b/bin/provision
@@ -14,8 +14,14 @@ for package in sqlite3 libsqlite3-ruby libactiverecord-ruby ruby-sqlite3 usbutil
   provision_package $package
 done
 
-# Make sure we have an initial hiera configuration.
+# Link hiera configuration.
 if [ ! -h "/etc/puppet/hiera.yaml" ]; then
   sudo rm -f /etc/puppet/hiera.yaml
   sudo ln -s /vagrant/puppet/hiera/hiera.yaml /etc/puppet/hiera.yaml
 fi
+
+# Link puppet configuration.
+if [ ! -h "/etc/puppet/puppet.conf" ]; then
+  sudo rm -f /etc/puppet/puppet.conf
+  sudo ln -s /vagrant/puppet/hiera/puppet.conf /etc/puppet/hiera.yaml
+fi