Rename 'hiera' to 'config'

diff --git a/bin/provision b/bin/provision
index 16f102f1e1ea8e7a0ea11815dbedfc41b24c2c23..a3036c2150beeb8aadc67e1e72cdc8f1ed95d86b 100755 (executable)
--- 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 a8ae7921740bbbe3a899f64f813be8ffe90adbd8..2e5600c9c7e7e68b7f93b57b48314a051c6c5f8a 100644 (file)
--- 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 52305658911c13f175fab8af337b1b34136a039e..31df7189845a49b90ecdec2b39c545c3377e123b 120000 (symlink)
--- 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