aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-07-06 13:51:59 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-07-06 13:51:59 -0300
commit47c83e6fc82afd55110c9184234e31dc751e5347 (patch)
tree62ca4e83375c166858421e5ee934d3fa068ebebf
parent6f0a560671461c477ea3868fe10abcd37163aff5 (diff)
downloadpuppet-bootstrap-47c83e6fc82afd55110c9184234e31dc751e5347.tar.gz
puppet-bootstrap-47c83e6fc82afd55110c9184234e31dc751e5347.tar.bz2
Vagrant provisioning fixes
-rw-r--r--Vagrantfile3
-rw-r--r--manifests/bootstrap/vagrant.pp35
-rw-r--r--modules/site_mail/files/aliases14
-rw-r--r--puppet.conf6
4 files changed, 19 insertions, 39 deletions
diff --git a/Vagrantfile b/Vagrantfile
index 64f356d..116bb49 100644
--- 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 e592d73..39c2b32 100644
--- a/manifests/bootstrap/vagrant.pp
+++ b/manifests/bootstrap/vagrant.pp
@@ -4,17 +4,6 @@
#
#
-# 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
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 b934314..aed5d29 100644
--- a/puppet.conf
+++ b/puppet.conf
@@ -1,3 +1,3 @@
-[main]
- environmentpath = $confdir/environments
- basemodulepath = $confdir/modules-0
+[master]
+ storeconfigs = true
+ dbadapter = sqlite3