commit 522ed16877e78f46689e7c02afa7704cc464737d Author: Xavier Lamien <laxathom(a)lxtnow.net&gt; Date: Sat Sep 7 01:43:39 2013 +0200 Make site.pp less intrusive by spliting out some default configs deployments. manifests/nodes.pp | 1 + manifests/nodes/buildserver.rpmfusion.org.pp | 9 ++++ manifests/site.pp | 52 -------------------------- 3 files changed, 10 insertions(+), 52 deletions(-) --- diff --git a/manifests/nodes.pp b/manifests/nodes.pp index e56b6c0..8d0b752 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -1,5 +1,6 @@ # Nodes, alphabetically +import 'default-setup.pp' node 'builder1.ovh.rpmfusion.lan' { $arch = 'i386' diff --git a/manifests/nodes/buildserver.rpmfusion.org.pp b/manifests/nodes/buildserver.rpmfusion.org.pp index b79d788..e894123 100644 --- a/manifests/nodes/buildserver.rpmfusion.org.pp +++ b/manifests/nodes/buildserver.rpmfusion.org.pp @@ -1,6 +1,15 @@ # All Build Server related nodes node 'koji01.rpmfusion.org' { + + class { 'puppet::agent': + forcenoop => false, + service => false, + cron_enable => true, + cron_silent => false, + puppet_server => 'puppet.rpmfusion.org', + } + class { 'koji::hub': koji_db_host => 'koji01.rpmfusion.org', koji_db_pass => 'admin', diff --git a/manifests/site.pp b/manifests/site.pp index 8755897..e0765a4 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -44,58 +44,6 @@ ssh-dss AAAAB3NzaC1kc3MAAACBAOM9F9gGUw/E9vhoW7a/yfgVdKjEnkp6M7DVjl+SDjoDZgfjTY1R ', } -# Non privileged user we want on all nodes, for various things -user { 'rpmfusion': - comment => 'RPM Fusion User', - managehome => true, -} -file { '/home/rpmfusion/.ssh': - require => User['rpmfusion'], - ensure => directory, - owner => 'rpmfusion', group => 'rpmfusion', mode => '0700', -} -file { '/home/rpmfusion/.ssh/authorized_keys': - owner => 'rpmfusion', group => 'rpmfusion', mode => '0600', - content => '# WARNING: This file is managed by puppet (from site.pp). -# WARNING: Do not manually edit it here, all changes will be discarded. -ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAaEVu8FZ9d9xhJyzohuJU82XN5fZL/6NqbDB4MTVvoDNaS36qp2z52AWoq5KOkFjzz1EaXspbe/fNSqQV7cNHmod6njPCDreC3e8t+GSFKUt1cMSlwGplXi7cYDQpWZdwlHpPpL5gnDcn57KZ8qn8ZoakdSr8/HFva9v934P5aGu0R87u6bIf0iKW56/GgNiT97zLwZjY2uiX1nDlwozJpGMXvTuzWKEoHsKhmP44J0xtK+IYuEiHaZwgmtU+Tes70rXRfIBIWMQkpx3OQjH4r4a0BEJ6OWf0cgF/JRwyuOnPVQN0dY065SOO7Vhe7y0tZzacwMlcYE0iEZ/Q1EdtGk7QJyKb1srho2pi9X8ye8Lw86/BbLdctbNZ4PFTNQyXFT2gSU2h3yNXbjwJEqCXinYtewseZZu/ystXd9r6/FJk3Qs9kzRBnom4mlDlmKy4cAqXVjaVCQI720Gu8sC3kv3iCVta/wUY5v62QwyPrNMN3lI3WVN2/T3GYBZy+YT/3TzHCx5xrxu1hsHp25s9g3k3CVxnOa+9bkeYcj2H6pC8dU= matthias -ssh-dss AAAAB3NzaC1kc3MAAACBAOM9F9gGUw/E9vhoW7a/yfgVdKjEnkp6M7DVjl+SDjoDZgfjTY1RV3YnBBRQ9vAk4Cc81hJpY6jVta1RQE6QMEdyu6DHC0vVkPlnWCnco2w2lNAAEnDqrfdGrgCQLUXozToY8y0tu7aRX274MMYmWS3ONkiBvHD9jxBd/ZFd16ilAAAAFQCX0Mp+oAITp2wnOz2pte2OvAF6bwAAAIBxL32Ff5RmTorA86vuUlgYSR1WQ0dUtRsnWTioH8OH4Q1r6kD6J5dAEmEYyf3fBAcRzvY9G0te4UbQ8Yqj+2YnrSsXLz4JRnIRS4BG71FX8zxxwRSM8l3wAYbpD0StnOuFu1lEAVU6gt883fPknhiU4ZcLTL4knyHEvUs2rDbtcQAAAIAZRkzzy/rKAWWEd6QSBDUk6Iaavs2B/VPk2G8rUI51ORJSsJZ+Q7yh4M4bXWXXnrNnHkMUB/2YDyLmWPITr3bGLst7tnzHrg7Qy2WBdWbdlxY2lXWRNzzo6170mBdUXqLyeo+cPg8xXnhd4GumZpdQ42fT347v1nEL+HAGYESCMg== xavier -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDnYiQsnoAJpqmZXzlq5Vv8TbfIQnV8IEYMyWZs0eU2Otec7QbCBJPchDKHVezEIPt+nHgSOg9QSE3OlVA4rhNrkxDnuxO9jwiSQmz8ayvlvig1hjp3C/GJmpM2sjljPA33YVTcOjFSab0GC7EIWF6mWQyDWHTvbdy9R4VRRy5jX4R6Hs3hLtNZs15UYAScLsmFitZKoW3TeIW1fTTuAM2p8h/KaMjMyQSiRrGQ97HTxipahLU2hjYiLMzgg3Xcfnnvi8I2Af8+c11Uy4bxQnMP4Ya40LbTc70oSYdb+VXjCBRXSAw+8K1vvX02ex/Wq5MsDdmQy7JzEb3M8vIMGU7E3I7UI3zRkXmwOKN9Vv8Jn7LxM/sgtixzC6qmwU420r6hRxmXT6H9uZRRX0UteCTxSdu0af+hTdjLd7fxm4L5EVYbm8btqfCpQuXPBesRCNvzvuMsIjdM9PvcTTNO1Sr8Zce+lAZLlddmPguCLIMcNrHl3HO0C+QnGWwQWWijViWsBBkuQs6QyxxKbEOt3RHhSa418te1GthcSzLF1xBoJ2KO8FrWeLQKL6HSq5HlbSQmhymlyRWCnfXhecjqrW+v1poowXPxlcPTRiK5ZCJ0s126IC70ANPQYwMTj5L+gLWGsn/sz0fHEC5b78Dbbuj9LkD2N6KmbqJgM7afx7zDjQ== nchauvet -ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp9/HaNnRFXbIM83lRhZjAed9TNrK9yKMc+WxeKbJygIW4k4R57VJg0E5hTDEdnNa2tIJI06dQf4LWpu5SoovMHOoLymKXoSLQmuacklEbjvG712JcqV8JVkdFqNYBBxvD5nqjE0stEHSG4YeFvKID8e66tjAb15gy0SDmq/e8/WK6BTQcR239qtHdsnkLnWvKHmPJFtitVjceMUqAWB7ZBx5Q8dn2b6b/bZHBwK4yxOSTCM15AWpv/c+PYpEakcB8GFDAkOl4IsFFngG2LAVRhM5kdFhiLztNN+T0T7Apd+DZYLgwGbJ5zEFLMwIt2xa82ZdNbaIE30ky46q3eKl4Q== nchauvet-old -', -} - -# Let's avoid an internal DNS server for now -host { 'puppet.ovh.rpmfusion.lan': - ip => '192.168.230.11', - host_aliases => 'puppet', -} -host { 'bugzilla.ovh.rpmfusion.lan': - ip => '192.168.230.12', - host_aliases => 'bugzilla', -} -host { 'builder1.ovh.rpmfusion.lan': - ip => '192.168.230.13', - host_aliases => [ 'builder1', 'builder1.rpmfusion.org' ], -} -host { 'old02.ovh.rpmfusion.lan': - ip => '192.168.230.14', - host_aliases => 'old02', -} -host { 'old03.ovh.rpmfusion.lan': - ip => '192.168.230.15', - host_aliases => [ 'old03', 'buildsys.rpmfusion.org' ], -} - -# Common puppet client configuration for all nodes -class { 'puppet::agent': - forcenoop => true, - service => false, - cron_enable => true, - cron_silent => false, - puppet_server => 'puppet.ovh.rpmfusion.lan', -} - # Minimal installs don't have restorecond running by default include selinux