aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-01-15 10:12:01 +0000
committerMichael Scherer <misc@mageia.org>2012-01-15 10:12:01 +0000
commitad0fd76de968f3017d15fb4628f43b19ad1bbf91 (patch)
treebf03586c0587b092a42a7414569abe2eec3be9f4
parentf217208714afc0a9ca764a3424146f77a30ff41e (diff)
downloadpuppet-ad0fd76de968f3017d15fb4628f43b19ad1bbf91.tar
puppet-ad0fd76de968f3017d15fb4628f43b19ad1bbf91.tar.gz
puppet-ad0fd76de968f3017d15fb4628f43b19ad1bbf91.tar.bz2
puppet-ad0fd76de968f3017d15fb4628f43b19ad1bbf91.tar.xz
puppet-ad0fd76de968f3017d15fb4628f43b19ad1bbf91.zip
deploy reports by irc on valstar
-rw-r--r--manifests/nodes.pp2
-rw-r--r--modules/puppet/templates/puppet.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 04d0c41b..77c309ae 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -13,6 +13,8 @@ node valstar {
include subversion::client
include subversion::server
include puppet::master
+ include reports::ii
+
include ssh::auth
include ssh::auth::keymaster
include buildsystem::mainnode
diff --git a/modules/puppet/templates/puppet.conf b/modules/puppet/templates/puppet.conf
index 795e4040..702f59af 100644
--- a/modules/puppet/templates/puppet.conf
+++ b/modules/puppet/templates/puppet.conf
@@ -18,7 +18,7 @@
# tagmail should be kept last, until this bug is fixed
# https://projects.puppetlabs.com/issues/5018
- reports = store,tagmail
+ reports = store,socket,tagmail
reportfrom = root@<%= domain %>
# Never remove this: