diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-10-01 13:34:05 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-10-01 13:34:05 -0300 |
| commit | a00729f75b00eadd4587754028ca098906a2b805 (patch) | |
| tree | 3dd5e07eae2704064ac49cde800fb7e2c231c206 | |
| parent | be8dd2fdec438fd67e5a5a90654e8388c9ffa4ad (diff) | |
| parent | c1af9eeeaef30150c33ff5c262998bf4b3744e14 (diff) | |
| download | debian-a00729f75b00eadd4587754028ca098906a2b805.tar.gz debian-a00729f75b00eadd4587754028ca098906a2b805.tar.bz2 | |
Merge commit 'c1af9eeeaef30150c33ff5c262998bf4b3744e14'
| -rwxr-xr-x | puppet/bin/provision | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/puppet/bin/provision b/puppet/bin/provision index 7fa056b..61acf59 100755 --- a/puppet/bin/provision +++ b/puppet/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 |