commit 259140a836a8aff4765bec6d158ca616ba926978
Merge: fdba55f 0b3cf9b
Author: root <root(a)puppet.ovh.rpmfusion.lan>
Date: Wed Sep 4 23:13:26 2013 +0200
Merge branch 'master' of
ssh://git.rpmfusion.org/git/infrastructure/puppet
files/dns/rpmfusion.org | 3 ++-
manifests/nodes.pp | 7 +++++++
modules/plague/files/plague-server.logrotate | 12 ++++++++++++
modules/plague/manifests/server.pp | 5 +++++
4 files changed, 26 insertions(+), 1 deletions(-)
---
diff --cc manifests/nodes.pp
index 30585d4,f3628fe..cc311c4
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@@ -1,7 -1,12 +1,13 @@@
# Nodes, alphabetically
+ node 'koji01.rpmfusion.org' {
+ class { 'koji::hub': }
+ class { 'koji::web': }
+ class { 'koji::kojira': }
+ }
+
node 'builder1.ovh.rpmfusion.lan' {
+ $arch = 'i386'
class { 'plague::builder':
build_hostname => 'builder1.rpmfusion.org',
smp_mflags => '2',