aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-01-08 21:13:08 +0000
committerMichael Scherer <misc@mageia.org>2011-01-08 21:13:08 +0000
commit045ec3f959f668562fe9f5e02abafd2f705bddac (patch)
tree3b6089efc4c7fc8f561df5e4cd04586a24029be5 /modules
parent1fb3f328a3b6be08b3b13332b7085511064b9433 (diff)
downloadpuppet-045ec3f959f668562fe9f5e02abafd2f705bddac.tar
puppet-045ec3f959f668562fe9f5e02abafd2f705bddac.tar.gz
puppet-045ec3f959f668562fe9f5e02abafd2f705bddac.tar.bz2
puppet-045ec3f959f668562fe9f5e02abafd2f705bddac.tar.xz
puppet-045ec3f959f668562fe9f5e02abafd2f705bddac.zip
report are sent by the puppetmaster, so the configuration of mail sending should on master side
Diffstat (limited to 'modules')
-rw-r--r--modules/puppet/templates/puppet.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/puppet/templates/puppet.conf b/modules/puppet/templates/puppet.conf
index c74b08f9..c5e68ee8 100644
--- a/modules/puppet/templates/puppet.conf
+++ b/modules/puppet/templates/puppet.conf
@@ -17,6 +17,7 @@
# tagmail should be kept last, until this bug is fixed
# https://projects.puppetlabs.com/issues/5018
reports = store,tagmail
+ reportfrom = root@<%= domain %>
storeconfigs = true
dbadapter = sqlite3
@@ -33,7 +34,6 @@
splay = true
report = true
- reportfrom = root@<%= domain %>
# The file in which puppetd stores a list of the classes
# associated with the retrieved configuratiion. Can be loaded in