Misc improvements and cleanup

8 files changed, 45 insertions, 40 deletions

diff --git a/Makefile b/Makefile
index ff8aa0d..0f6959e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,21 @@
 #
-#  Puppet Boostrap Makefile by Silvio Rhatto (rhatto at riseup.net).
+# Puppet Boostrap Makefile by Silvio Rhatto (rhatto at riseup.net).
 #
-#  This Makefile is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by the Free
-#  Software Foundation; either version 3 of the License, or any later version.
+# This Makefile is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or any later version.
 #
-#  This Makefile is distributed in the hope that it will be useful, but WITHOUT
-#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#  #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# This Makefile is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place - Suite 330, Boston, MA 02111-1307, USA
 #
 
-REPO   = git://git.sarava.org/puppet-bootstrap.git
 CWD    = $(shell pwd)
+REPO   = git://git.sarava.org/puppet-bootstrap.git
 PUPPET = FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules
 
 all: clean remote modules
diff --git a/bin/dependencies b/bin/dependencies
index 148ab84..c410852 100755
--- a/bin/dependencies
+++ b/bin/dependencies
@@ -18,6 +18,6 @@ function provision_package {
 }
 
 # Ensure basic packages are installed.
-for package in puppet ruby-hiera-puppet mr; do
+for package in puppet ruby-hiera-puppet mr whois; do
   provision_package $package
 done
diff --git a/hiera/bootstrap.yaml b/hiera/bootstrap.yaml
index e189b51..2353846 100644
--- a/hiera/bootstrap.yaml
+++ b/hiera/bootstrap.yaml
@@ -1,12 +1,28 @@
 ---
 #
-# Boostrap
+# 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
 #
-# Use "mkpasswd -m sha-512" to generate root and first user's passwords
 # Do not include "ssh-rsa " into the sshkey definition.
-bootstrap::base_domain:          'vagrantup.com'
-bootstrap::root::password:       ''
-bootstrap::first_user:           'user'
+bootstrap::first_user:           ''
 bootstrap::first_user::password: ''
 bootstrap::first_user::sshkey:   ''
 bootstrap::first_user::email:    ''
diff --git a/manifests/classes/configurator.pp b/manifests/classes/configurator.pp
index b9b7e9e..cf2d891 100644
--- a/manifests/classes/configurator.pp
+++ b/manifests/classes/configurator.pp
@@ -1,5 +1,5 @@
 #
-# Puppet Bootstrap Configuration Manifest
+# Puppet Bootstrap Configuration Manifest.
 #
 # This file is responsible to set custom configuration in the bootstrap
 # repository for values set in the hiera configuration.
diff --git a/manifests/host.pp b/manifests/host.pp
index 6cb2927..ea23fb4 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -4,8 +4,8 @@
 # virtual machine.
 #
 
-# Import the needed config and modules
-import "nodo"
+# Import site configuration
+import "site.pp"
 
 # The server role
 include nodo::role::server
diff --git a/manifests/master.pp b/manifests/master.pp
index 0b64523..f53f00e 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -5,9 +5,8 @@
 # Once it's running it can setup all the other nodes.
 #
 
-# Import the needed config and modules
-import "config.pp"
-import "nodo"
+# Import site configuration
+import "site.pp"
 
 # Include the master node configuration
 include nodo::role::master
diff --git a/manifests/repository.pp b/manifests/repository.pp
deleted file mode 100644
index 9564123..0000000
--- a/manifests/repository.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This manifest is intended to generate the initial
-# puppet repository.
-#
-
-# Import the needed config and modules
-import "config.pp"
-import "classes/puppet_bootstrap.pp"
-
-# Setup modules for use with other stages
-include puppet_bootstrap
-
-puppet_bootstrap::puppet_modules{ "modules":
-  puppet_dir => "$puppet_bootstrap_tmpdir",
-}
diff --git a/manifests/vagrant.pp b/manifests/vagrant.pp
index 94d5896..7e6c6c7 100644
--- a/manifests/vagrant.pp
+++ b/manifests/vagrant.pp
@@ -1,5 +1,10 @@
-# Import main module
-import "nodo"
+#
+# This manifest is intended to configure a vagrant
+# virtual machine.
+#
+
+# Import site configuration
+import "site.pp"
 
 #
 # Stage definitions