From b75d0f3603fef2c76c546bde6e0060411b4c19c9 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 22 Mar 2016 13:46:16 -0300
Subject: Rename 'hiera' to 'config'

---
 bin/provision                                 |  2 +-
 config/bootstrap.yaml                         | 44 ++++++++++++++++++++++++++
 config/common.yaml                            | 45 +++++++++++++++++++++++++++
 config/hiera.yaml                             | 33 ++++++++++++++++++++
 config/node/puppet-bootstrap.example.org.yaml | 14 +++++++++
 hiera.yaml                                    |  2 +-
 hiera/bootstrap.yaml                          | 44 --------------------------
 hiera/common.yaml                             | 45 ---------------------------
 hiera/hiera.yaml                              | 33 --------------------
 hiera/node/puppet-bootstrap.example.org.yaml  | 14 ---------
 10 files changed, 138 insertions(+), 138 deletions(-)
 create mode 100644 config/bootstrap.yaml
 create mode 100644 config/common.yaml
 create mode 100644 config/hiera.yaml
 create mode 100644 config/node/puppet-bootstrap.example.org.yaml
 delete mode 100644 hiera/bootstrap.yaml
 delete mode 100644 hiera/common.yaml
 delete mode 100644 hiera/hiera.yaml
 delete mode 100644 hiera/node/puppet-bootstrap.example.org.yaml

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/config/bootstrap.yaml b/config/bootstrap.yaml
new file mode 100644
index 0000000..ce72bfb
--- /dev/null
+++ b/config/bootstrap.yaml
@@ -0,0 +1,44 @@
+---
+#
+# Puppet Bootstrap Configuration Parameters.
+#
+# This file is responsible to set custom values to your new puppet repository
+# to reflect the custom configuration for your infrastructure.
+#
+# This configuration is useful mostly after you cloned the puppet-boostrap module
+# and want to configure it to boostrap a whole puppetmaster infrastructure.
+#
+
+# The base domain for your infrastructure.
+bootstrap::base_domain: 'vagrantup.com'
+
+#
+# Root password.
+#
+# Use "mkpasswd -m sha-512" to generate root and first user's passwords.
+bootstrap::root::password: ''
+
+#
+# First user account
+#
+# Do not include "ssh-rsa " into the sshkey definition.
+bootstrap::first_user:           ''
+bootstrap::first_user::password: ''
+bootstrap::first_user::sshkey:   ''
+bootstrap::first_user::email:    ''
+
+#
+# First nodes
+#
+
+# Hostname of the first server
+bootstrap:first_hostname: ''
+
+# Create manifests and config for the first nodes?
+bootstrap::first_nodes:   false
+
+# MySQL password
+mysql::server::rootpw: ''
+
+# Puppet master db password
+nodo::role::master::db_password: ''
diff --git a/config/common.yaml b/config/common.yaml
new file mode 100644
index 0000000..006c5a8
--- /dev/null
+++ b/config/common.yaml
@@ -0,0 +1,45 @@
+---
+#
+# General
+#
+nodo::subsystem::apt::include_src: false
+nodo::subsystem::apt::use_next_release: false
+nodo::subsystem::monitor::use_nagios: false
+nodo::subsystem::monitor::address: "%{::fqdn}"
+
+#
+# Firewall
+#
+firewall::ssl_ratelimit: "s:ssl:200/min:20"
+firewall::local_net: false
+firewall::local::manage_host: true
+firewall::local::manage_iface: false
+
+#
+# Mail
+#
+mail::sympa::subdomain: "listas"
+mail::sympa::lang: "pt_BR"
+
+#
+# Monitoring
+#
+nodo::munin_node::allow: '127.0.0.1:192.168.0.[0-9]*:192.168.1.[0-9]*'
+
+#
+# Timezone and ntp
+#
+ntp::zone: "Brazil/East"
+ntp::pool: "south-america.pool.ntp.org"
+ntp::servers:
+  - 'a.ntp.br'
+  - 'b.ntp.br'
+  - 'c.ntp.br'
+
+#
+# Nameservers
+#
+# OpenDNS
+nodo::subsystem::resolver::nameservers:
+  - '208.67.222.222'
+  - '208.67.220.220'
diff --git a/config/hiera.yaml b/config/hiera.yaml
new file mode 100644
index 0000000..2e5600c
--- /dev/null
+++ b/config/hiera.yaml
@@ -0,0 +1,33 @@
+---
+:backends:
+  - yaml
+:yaml:
+  # Right now vagrant and puppet are not fully supporting
+  # a relative datadir. For it to work, we were forced to
+  # create a manifests/hiera symlink. This should be
+  # reconsidered in the future.
+  #
+  # See http://docs.vagrantup.com/v2/provisioning/puppet_apply.html
+  :datadir: '%{settings::confdir}/config'
+:hierarchy:
+  #
+  # Put in the secrets folder all sensitive information that
+  # wont be spread into every system if you're using the Hydra Suite.
+  #
+  # We also recommend to leave only encrypted data in your hiera config.
+  #
+  - 'secrets/node/%{::clientcert}'
+  - 'secrets/role/%{::nodo::role}'
+  - 'secrets/location/%{::nodo::location}'
+  - 'secrets/domain/%{::domain}'
+
+  #
+  # All other stuff goes in regular YAML files.
+  #
+  - 'node/%{::clientcert}'
+  - 'role/%{::nodo::role}'
+  - 'virtual/%{::virtual}'
+  - 'location/%{::nodo::location}'
+  - 'domain/%{::domain}'
+  - bootstrap
+  - common
diff --git a/config/node/puppet-bootstrap.example.org.yaml b/config/node/puppet-bootstrap.example.org.yaml
new file mode 100644
index 0000000..c108e7d
--- /dev/null
+++ b/config/node/puppet-bootstrap.example.org.yaml
@@ -0,0 +1,14 @@
+---
+#
+# MySQL
+#
+# The following password is public information and therefore
+# shall not be user on production.
+mysql::server::rootpw: '9pRfteNbSFFyrHhackme'
+
+#
+# Backup
+#
+nodo::subsystem::backup::localhost: false
+nodo::subsystem::backup::encryptkey: 'none'
+nodo::subsystem::backup::password: 'hacked'
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
diff --git a/hiera/bootstrap.yaml b/hiera/bootstrap.yaml
deleted file mode 100644
index ce72bfb..0000000
--- a/hiera/bootstrap.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-#
-# Puppet Bootstrap Configuration Parameters.
-#
-# This file is responsible to set custom values to your new puppet repository
-# to reflect the custom configuration for your infrastructure.
-#
-# This configuration is useful mostly after you cloned the puppet-boostrap module
-# and want to configure it to boostrap a whole puppetmaster infrastructure.
-#
-
-# The base domain for your infrastructure.
-bootstrap::base_domain: 'vagrantup.com'
-
-#
-# Root password.
-#
-# Use "mkpasswd -m sha-512" to generate root and first user's passwords.
-bootstrap::root::password: ''
-
-#
-# First user account
-#
-# Do not include "ssh-rsa " into the sshkey definition.
-bootstrap::first_user:           ''
-bootstrap::first_user::password: ''
-bootstrap::first_user::sshkey:   ''
-bootstrap::first_user::email:    ''
-
-#
-# First nodes
-#
-
-# Hostname of the first server
-bootstrap:first_hostname: ''
-
-# Create manifests and config for the first nodes?
-bootstrap::first_nodes:   false
-
-# MySQL password
-mysql::server::rootpw: ''
-
-# Puppet master db password
-nodo::role::master::db_password: ''
diff --git a/hiera/common.yaml b/hiera/common.yaml
deleted file mode 100644
index 006c5a8..0000000
--- a/hiera/common.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-#
-# General
-#
-nodo::subsystem::apt::include_src: false
-nodo::subsystem::apt::use_next_release: false
-nodo::subsystem::monitor::use_nagios: false
-nodo::subsystem::monitor::address: "%{::fqdn}"
-
-#
-# Firewall
-#
-firewall::ssl_ratelimit: "s:ssl:200/min:20"
-firewall::local_net: false
-firewall::local::manage_host: true
-firewall::local::manage_iface: false
-
-#
-# Mail
-#
-mail::sympa::subdomain: "listas"
-mail::sympa::lang: "pt_BR"
-
-#
-# Monitoring
-#
-nodo::munin_node::allow: '127.0.0.1:192.168.0.[0-9]*:192.168.1.[0-9]*'
-
-#
-# Timezone and ntp
-#
-ntp::zone: "Brazil/East"
-ntp::pool: "south-america.pool.ntp.org"
-ntp::servers:
-  - 'a.ntp.br'
-  - 'b.ntp.br'
-  - 'c.ntp.br'
-
-#
-# Nameservers
-#
-# OpenDNS
-nodo::subsystem::resolver::nameservers:
-  - '208.67.222.222'
-  - '208.67.220.220'
diff --git a/hiera/hiera.yaml b/hiera/hiera.yaml
deleted file mode 100644
index a8ae792..0000000
--- a/hiera/hiera.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-:backends:
-  - yaml
-:yaml:
-  # Right now vagrant and puppet are not fully supporting
-  # a relative datadir. For it to work, we were forced to
-  # create a manifests/hiera symlink. This should be
-  # reconsidered in the future.
-  #
-  # See http://docs.vagrantup.com/v2/provisioning/puppet_apply.html
-  :datadir: '%{settings::confdir}/hiera'
-:hierarchy:
-  #
-  # Put in the secrets folder all sensitive information that
-  # wont be spread into every system if you're using the Hydra Suite.
-  #
-  # We also recommend to leave only encrypted data in your hiera config.
-  #
-  - 'secrets/node/%{::clientcert}'
-  - 'secrets/role/%{::nodo::role}'
-  - 'secrets/location/%{::nodo::location}'
-  - 'secrets/domain/%{::domain}'
-
-  #
-  # All other stuff goes in regular YAML files.
-  #
-  - 'node/%{::clientcert}'
-  - 'role/%{::nodo::role}'
-  - 'virtual/%{::virtual}'
-  - 'location/%{::nodo::location}'
-  - 'domain/%{::domain}'
-  - bootstrap
-  - common
diff --git a/hiera/node/puppet-bootstrap.example.org.yaml b/hiera/node/puppet-bootstrap.example.org.yaml
deleted file mode 100644
index c108e7d..0000000
--- a/hiera/node/puppet-bootstrap.example.org.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-#
-# MySQL
-#
-# The following password is public information and therefore
-# shall not be user on production.
-mysql::server::rootpw: '9pRfteNbSFFyrHhackme'
-
-#
-# Backup
-#
-nodo::subsystem::backup::localhost: false
-nodo::subsystem::backup::encryptkey: 'none'
-nodo::subsystem::backup::password: 'hacked'
-- 
cgit v1.2.3