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

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 8ffabccfbe1c14b202fd463770b8f70380433d03..1a839469124eb683eca6768b2c8a80e44dee3990 100644 (file)
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -11,7 +11,7 @@ rundir=/var/run/puppet
 factpath=$vardir/facts
 pluginsync=true
 # This is the default environment for all clients
-environment=staging
+environment=production 
 
 [puppetmasterd]
 templatedir=/etc/puppet/templates

diff --git a/modules/munin-node/manifests/master.pp b/modules/munin-node/manifests/master.pp
index c7eb80b504e1088dd111ecdb683b5c09a8ca7dae..cff2941ddee7953c7dbe59d88937c5955a3f1631 100644 (file)
--- a/modules/munin-node/manifests/master.pp
+++ b/modules/munin-node/manifests/master.pp
@@ -4,7 +4,7 @@ class munin-node::master inherits munin-node {
 
     file {
         "/etc/munin/munin.conf":
-            content => template("munin/munin.conf.erb"),
+            content => template("munin-node/munin.conf.erb"),
             require => Package["munin"];
     }
 }