From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 22 Mar 2016 16:46:16 +0000 (-0300)
Subject: Rename 'hiera' to 'config'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b75d0f3603fef2c76c546bde6e0060411b4c19c9;p=puppet-bootstrap.git

Rename 'hiera' to 'config'
---

diff --git a/bin/provision b/bin/provision
index 16f102f..a3036c2 100755
--- a/bin/provision
+++ b/bin/provision
@@ -25,7 +25,7 @@ done
 # Link hiera configuration if needed.
 if [ ! -h "/etc/puppet/hiera.yaml" ]; then
   $SUDO rm -f /etc/puppet/hiera.yaml
-  $SUDO ln -s $DIRNAME/../hiera/hiera.yaml /etc/puppet/hiera.yaml
+  $SUDO ln -s $DIRNAME/../config/hiera.yaml /etc/puppet/hiera.yaml
 fi
 
 # Link puppet configuration if needed.
diff --git a/hiera/bootstrap.yaml b/config/bootstrap.yaml
similarity index 100%
rename from hiera/bootstrap.yaml
rename to config/bootstrap.yaml
diff --git a/hiera/common.yaml b/config/common.yaml
similarity index 100%
rename from hiera/common.yaml
rename to config/common.yaml
diff --git a/hiera/hiera.yaml b/config/hiera.yaml
similarity index 95%
rename from hiera/hiera.yaml
rename to config/hiera.yaml
index a8ae792..2e5600c 100644
--- a/hiera/hiera.yaml
+++ b/config/hiera.yaml
@@ -8,7 +8,7 @@
   # reconsidered in the future.
   #
   # See http://docs.vagrantup.com/v2/provisioning/puppet_apply.html
-  :datadir: '%{settings::confdir}/hiera'
+  :datadir: '%{settings::confdir}/config'
 :hierarchy:
   #
   # Put in the secrets folder all sensitive information that
diff --git a/hiera/node/puppet-bootstrap.example.org.yaml b/config/node/puppet-bootstrap.example.org.yaml
similarity index 100%
rename from hiera/node/puppet-bootstrap.example.org.yaml
rename to config/node/puppet-bootstrap.example.org.yaml
diff --git a/hiera.yaml b/hiera.yaml
index 5230565..31df718 120000
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -1 +1 @@
-hiera/hiera.yaml
\ No newline at end of file
+config/hiera.yaml
\ No newline at end of file