commit e14cb18deabe6becba80c6435f634bd5832438ea Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org&gt; Date: Thu Sep 5 22:42:51 2013 +0200 Add subdir to manage private configs against some restricted nodes. manifests/nodes.pp | 8 -------- manifests/nodes/buidlers.rpmfusion.org.pp | 1 + manifests/nodes/buildsys.rpmfusion.org.pp | 10 ++++++++++ manifests/site.pp | 3 +++ 4 files changed, 14 insertions(+), 8 deletions(-) --- diff --git a/manifests/nodes.pp b/manifests/nodes.pp index 9791274..e56b6c0 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -1,13 +1,5 @@ # Nodes, alphabetically -node 'koji01.rpmfusion.org' { - class { 'koji::hub': - koji_db_host => 'koji01.rpmfusion.org', - koji_db_pass => 'admin', - } - class { 'koji::web': } - class { 'koji::kojira': } -} node 'builder1.ovh.rpmfusion.lan' { $arch = 'i386' diff --git a/manifests/nodes/buidlers.rpmfusion.org.pp b/manifests/nodes/buidlers.rpmfusion.org.pp new file mode 100644 index 0000000..cec3973 --- /dev/null +++ b/manifests/nodes/buidlers.rpmfusion.org.pp @@ -0,0 +1 @@ +# Builders related nodes diff --git a/manifests/nodes/buildsys.rpmfusion.org.pp b/manifests/nodes/buildsys.rpmfusion.org.pp new file mode 100644 index 0000000..fcabfba --- /dev/null +++ b/manifests/nodes/buildsys.rpmfusion.org.pp @@ -0,0 +1,10 @@ +# All Build Server related nodes + +node 'koji01.rpmfusion.org' { + class { 'koji::hub': + koji_db_host => 'koji01.rpmfusion.org', + koji_db_pass => 'admin', + } + class { 'koji::web': } + class { 'koji::kojira': } +} diff --git a/manifests/nodes/pkgs.rpmfusion.org.pp b/manifests/nodes/pkgs.rpmfusion.org.pp new file mode 100644 index 0000000..e69de29 diff --git a/manifests/site.pp b/manifests/site.pp index db548bb..8755897 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -99,5 +99,8 @@ class { 'puppet::agent': # Minimal installs don't have restorecond running by default include selinux +# Main/Obvious nodes import 'nodes.pp' +# splited nodes to better manage private & public. +import 'nodes/*.pp'