Vagrant provisioning fixes

diff --git a/Vagrantfile b/Vagrantfile
index 64f356dd918474784862dd79275eeb75b722e028..116bb490e258c99761f879ea11d3abf6769bb8ce 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,7 +6,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "jessie"
 
   # Shell provisioner to setup basic environment.
-  #config.vm.provision :shell, :inline => "/vagrant/puppet/bin/provision"
+  config.vm.provision :shell, :inline => "/vagrant/puppet/bin/provision"
 
   # Enable provisioning with Puppet stand alone.
   config.vm.provision :puppet do |puppet|
@@ -15,6 +15,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     puppet.module_path       = "puppet/modules"
     puppet.temp_dir          = "/etc/puppet"
     puppet.working_directory = "/etc/puppet"
+    puppet.hiera_config_path = "hiera.yaml"
   end
   # end
 

diff --git a/manifests/bootstrap/vagrant.pp b/manifests/bootstrap/vagrant.pp
index e592d738c75e6d75e2f8e0deb577f48c8c0c9947..39c2b32221da303304aaa5f35b3f9a5e57e316d2 100644 (file)
--- a/manifests/bootstrap/vagrant.pp
+++ b/manifests/bootstrap/vagrant.pp
@@ -3,17 +3,6 @@
 # virtual machine.
 #
 
-#
-# Stage definitions
-#
-
-stage { 'first':
-  before => Stage['main'],
-}
-
-stage { 'last': }
-Stage['main'] -> Stage['last']
-
 #
 # Class definitions
 #
@@ -22,27 +11,3 @@ Stage['main'] -> Stage['last']
 class { 'nodo':
   role => 'vagrant',
 }
-
-class vagrant_config {
-  # Symlink to the mounted module folder
-  file { '/etc/puppet/modules':
-    ensure => '/etc/puppet/modules-0',
-    force  => true,
-  }
-
-  # Ensure a custom hiera configuration
-  file { '/etc/puppet/hiera.yaml':
-    owner  => root,
-    group  => root,
-    mode   => 0644,
-    force  => true,
-    ensure => '/etc/puppet/hiera/hiera.yaml',
-  }
-}
-
-#
-# Class instantiations
-#
-class { 'vagrant_config':
-  stage => first,
-}

diff --git a/modules/site_mail/files/aliases b/modules/site_mail/files/aliases
new file mode 100644 (file)
index 0000000..08a0723
--- /dev/null
+++ b/modules/site_mail/files/aliases
@@ -0,0 +1,14 @@
+# /etc/aliases
+mailer-daemon: postmaster
+postmaster: root
+nobody: root
+hostmaster: root
+usenet: root
+news: root
+webmaster: root
+www: root
+ftp: root
+abuse: root
+noc: root
+security: root
+reprepro: root

diff --git a/puppet.conf b/puppet.conf
index b9343143cbf69be9f0277ff131ec94f9b0c409af..aed5d298438b065ad44f14da223f14807c60ef15 100644 (file)
--- a/puppet.conf
+++ b/puppet.conf
@@ -1,3 +1,3 @@
-[main]
-  environmentpath = $confdir/environments
-  basemodulepath  = $confdir/modules-0
+[master]
+  storeconfigs = true
+  dbadapter    = sqlite3