commit 0b3cf9b23af10736160406cde9fef3296a2a5e15 Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org&gt; Date: Wed Sep 4 23:03:37 2013 +0200 Add koji master to puppet. files/dns/rpmfusion.org | 3 ++- manifests/nodes.pp | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletions(-) --- diff --git a/files/dns/rpmfusion.org b/files/dns/rpmfusion.org index a9f4d28..113578f 100644 --- a/files/dns/rpmfusion.org +++ b/files/dns/rpmfusion.org @@ -1,6 +1,6 @@ $TTL 5M @ IN SOA ns1.rpmfusion.net. matthias.saou.eu. ( - 2013071102 ; Serial + 2013090401 ; Serial 6H ; Refresh 1H ; Retry 5W ; Expire @@ -31,6 +31,7 @@ fas IN A 46.105.55.73 ; se03.ovh / old02.ovh cvs IN A 46.105.55.73 ; se03.ovh / old02.ovh ldap IN A 46.105.55.73 ; se03.ovh / old02.ovh buildsys IN A 188.165.226.50 ; hv02.ovh / old03.ovh +koji01 IN A 212.83.132.100 ; koji01.online builder1 IN CNAME hv02.ovh.rpmfusion.net. ; ports 8888:8889 puppet01 IN CNAME hv02.ovh.rpmfusion.net. ; ports 8140:8140 diff --git a/manifests/nodes.pp b/manifests/nodes.pp index ea221fb..f3628fe 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -1,5 +1,11 @@ # Nodes, alphabetically +node 'koji01.rpmfusion.org' { + class { 'koji::hub': } + class { 'koji::web': } + class { 'koji::kojira': } +} + node 'builder1.ovh.rpmfusion.lan' { class { 'plague::builder': build_hostname => 'builder1.rpmfusion.org', @@ -171,6 +177,7 @@ node 'puppet.ovh.rpmfusion.lan' { '-A INPUT -s 88.190.227.71 -p tcp --dport 8140 -j ACCEPT', '-A INPUT -s 88.190.227.172 -p tcp --dport 8140 -j ACCEPT', '-A INPUT -s 129.143.116.115 -p tcp --dport 8140 -j ACCEPT', + '-A INPUT -s 212.83.132.100 -p tcp --dport 8140 -j ACCEPT', ], } }