Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Fix ensure value for postgres
  Update postgres fact
  Use absolute includes, not relative ones

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index a89677d..d8d2271 100644 (file)
--- a/modules/munin/manifests/master.pp
+++ b/modules/munin/manifests/master.pp
@@ -22,7 +22,7 @@ class munin::master {
                source  => 'puppet:///files/empty/',
        }
 
-       Munin::Master-per-node<<| |>>
+       Munin::Master_per_node<<| |>>
 
        file { '/etc/cron.d/puppet-munin-cleanup':
                source => 'puppet:///modules/munin/master-cleanup-cron',