diff options
author | Michael Scherer <misc@mageia.org> | 2012-01-16 16:20:01 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-01-16 16:20:01 +0000 |
commit | edede56b2b5872feba831b05a2a374017f6a41d9 (patch) | |
tree | a7949fa4c4f7490a2dbbd20e044ee21d50b80f03 | |
parent | eaf9b73d600ab86b2372f594268dda18f8d874b7 (diff) | |
download | puppet-edede56b2b5872feba831b05a2a374017f6a41d9.tar puppet-edede56b2b5872feba831b05a2a374017f6a41d9.tar.gz puppet-edede56b2b5872feba831b05a2a374017f6a41d9.tar.bz2 puppet-edede56b2b5872feba831b05a2a374017f6a41d9.tar.xz puppet-edede56b2b5872feba831b05a2a374017f6a41d9.zip |
split nodes.pp into smaller file, one per server
-rw-r--r-- | manifests/nodes.pp | 274 | ||||
-rw-r--r-- | manifests/nodes/alamut.pp | 74 | ||||
-rw-r--r-- | manifests/nodes/champagne.pp | 19 | ||||
-rw-r--r-- | manifests/nodes/ecosse.pp | 7 | ||||
-rw-r--r-- | manifests/nodes/fiona.pp | 11 | ||||
-rw-r--r-- | manifests/nodes/friteuse.pp | 8 | ||||
-rw-r--r-- | manifests/nodes/jonund.pp | 11 | ||||
-rw-r--r-- | manifests/nodes/krampouezh.pp | 21 | ||||
-rw-r--r-- | manifests/nodes/rabbit.pp | 58 | ||||
-rw-r--r-- | manifests/nodes/valstar.pp | 55 |
10 files changed, 265 insertions, 273 deletions
diff --git a/manifests/nodes.pp b/manifests/nodes.pp index 7c2f3ae8..32f64a25 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -4,276 +4,4 @@ node default { include common::default_mageia_server } -# svn, big important server -node valstar { -# Location: IELO datacenter (marseille) -# -# TODO: -# - GIT server -# - setup maintainers database (with web interface) -# - include common::default_mageia_server - timezone::timezone { "Europe/Paris": } - include main_mirror - include openldap::master - include subversion::client - include subversion::server - include puppet::master - include reports::ii - - include ssh::auth - include ssh::auth::keymaster - include buildsystem::mainnode - include buildsystem::mgacreatehome - include buildsystem::sync20101 - include buildsystem::release - include buildsystem::maintdb - include buildsystem::binrepo - include softwarekey::base - - include access_classes::committers - include restrictshell::allow_git - include restrictshell::allow_svn - include restrictshell::allow_pkgsubmit - include restrictshell::allow_maintdb - include restrictshell::allow_upload_bin - # disabled the ldap key here instead of disabling for the - # whole module ( see r698 ) - class { "openssh::ssh_keys_from_ldap": - symlink_users => ['schedbot', 'iurt'] - } - - include mirror::mdv2010spring - - include repositories::subversion - include repositories::git - include repositories::sparkleshare - - include websites::svn - - subversion::snapshot { "/etc/puppet": - source => "svn://svn.mageia.org/svn/adm/puppet/" - } - - mirror_cleaner::orphans { "cauldron": - base => "/distrib/bootstrap/distrib/", - } - -} - -# web apps -node alamut { -# Location: IELO datacenter (marseille) -# -# TODO: -# - Review board -# - api -# - wiki -# - pastebin -# - LDAP slave -# - include common::default_mageia_server_no_smtp - include postgresql::server - postgresql::tagged { "default": } - - timezone::timezone { "Europe/Paris": } - - include catdap - include mga-mirrors - include epoll - include transifex - include bugzilla - include sympa::server - include postfix::primary_smtp - - # temporary, just the time the vm is running there - host { 'friteuse': - ip => '192.168.122.131', - host_aliases => [ "friteuse.$domain", "forums.$domain" ], - ensure => 'present', - } - - # to create all phpbb database on alamut - phpbb::databases { $fqdn: } - - apache::vhost_redirect_ssl { "forums.$domain": } - apache::vhost_redirect { "forum.$domain": - url => "https://forums.$domain/", - } - apache::vhost_redirect { "ssl_forum.$domain": - url => "https://forums.$domain/", - vhost => "forum.$domain", - use_ssl => true, - } - - # connect to ssl so the proxy do not shoke if trying to - # enforce ssl ( note that this has not been tested, maybe this - # is uneeded ) - apache::vhost_reverse_proxy { "ssl_forums.$domain": - url => "https://forums.$domain/", - vhost => "forums.$domain", - use_ssl => true, - } - - include tld_redirections - - include libvirtd::kvm - include lists - include dns::server - include repositories::svn_mirror - include viewvc - - # disabled until fixed - #include repositories::git_mirror - include gitweb - - include xymon::server - apache::vhost_simple { "xymon.$domain": - location => "/var/lib/xymon/www", - } - include youri-check::report - - include wikis -} - -# buildnode -node jonund { -# Location: IELO datacenter (marseille) -# - include common::default_mageia_server - include buildsystem::buildnode - include buildsystem::iurt20101 - timezone::timezone { "Europe/Paris": } - include shorewall - include shorewall::default_firewall -} - -node ecosse { -# Location: IELO datacenter (marseille) -# - include common::default_mageia_server - include buildsystem::buildnode - timezone::timezone { "Europe/Paris": } -} - -# backup server -node fiona { -# Location: IELO datacenter (marseille) -# -# TODO: -# - buy the server -# - install the server in datacenter -# - install a backup system - include common::default_mageia_server - timezone::timezone { "Europe/Paris": } -} - -# gandi-vm -node krampouezh { -# Location: gandi VM -# -# - #include common::default_mageia_server - include common::default_mageia_server_no_smtp - include postfix::secondary_smtp - include blog::base - include blog::db_backup - include mysql::server - include dns::server - timezone::timezone { "Europe/Paris": } - - openldap::slave_instance { "1": - rid => 1, - } - -# Other services running on this server : -# - meetbot -} - -node champagne { -# Location: gandi VM -# -# TODO: -# - setup mageia.org web site -# - include common::default_mageia_server - timezone::timezone { "Europe/Paris": } - include blog::files-bots - include blog::files_backup - include planet - include websites::static - include websites::hugs - include websites::releases - include websites::www - include dashboard::base - include access_classes::web - include openssh::ssh_keys_from_ldap -} - -node friteuse { -# Location: VM hosted by nfrance (toulouse) -# - - include common::default_mageia_server - timezone::timezone { "Europe/Paris": } - include forums -} - -node rabbit { -# Location: Server offered by Dedibox (paris) -# -# - used to create isos ( and live, and so on ) -# - include common::default_mageia_server - timezone::timezone { "Europe/Paris": } - include bcd::base - include bcd::web - include bcd::rsync - include draklive::base - include access_classes::iso_makers - include openssh::ssh_keys_from_ldap - include mirror::mageia - include mirror::newrelease - include releasekey::base - include youri-check::check - - # for testing iso quickly - include libvirtd::kvm - libvirtd::group_access { "mga-iso_makers": } - - # to ease the creation of test iso - $netinst_iso_path = "/var/lib/libvirt/netboot" - - file { $netinst_iso_path: - ensure => directory, - } - - libvirtd::storage { "netinst_iso": - path => $netinst_iso_path, - require => File[$netinst_iso_path], - } - - include auto_installation::download - auto_installation::download::netboot_images { "mandriva": - path => $netinst_iso_path, - versions => ["2010.0","2010.1"], - archs => ['i586','x86_64'], - mirror_path => "ftp://ftp.free.fr/pub/Distributions_Linux/MandrivaLinux/official/%{version}/%{arch}/install/images/", - files => ['boot.iso'], - require => File[$netinst_iso_path], - } - - # for testing pxe support of libvirt - include auto_installation::variables - libvirtd::network {"pxe_network": - network => "192.168.123.0/24", - tftp_root => $auto_installation::variables::pxe_dir, - bridge_name => "virbr1", - } - - include auto_installation::pxe_menu - auto_installation::mandriva_installation_entry { "pxe_test": - version => "2010.1", - arch => "i586", - } -} +import "nodes/*.pp" diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp new file mode 100644 index 00000000..f48472df --- /dev/null +++ b/manifests/nodes/alamut.pp @@ -0,0 +1,74 @@ +# web apps +node alamut { +# Location: IELO datacenter (marseille) +# +# TODO: +# - Review board +# - api +# - pastebin +# - LDAP slave +# + include common::default_mageia_server_no_smtp + include postgresql::server + postgresql::tagged { "default": } + + timezone::timezone { "Europe/Paris": } + + include catdap + include mga-mirrors + include epoll + include transifex + include bugzilla + include sympa::server + include postfix::primary_smtp + + # temporary, just the time the vm is running there + host { 'friteuse': + ip => '192.168.122.131', + host_aliases => [ "friteuse.$domain", "forums.$domain" ], + ensure => 'present', + } + + # to create all phpbb database on alamut + phpbb::databases { $fqdn: } + + apache::vhost_redirect_ssl { "forums.$domain": } + apache::vhost_redirect { "forum.$domain": + url => "https://forums.$domain/", + } + apache::vhost_redirect { "ssl_forum.$domain": + url => "https://forums.$domain/", + vhost => "forum.$domain", + use_ssl => true, + } + + # connect to ssl so the proxy do not shoke if trying to + # enforce ssl ( note that this has not been tested, maybe this + # is uneeded ) + apache::vhost_reverse_proxy { "ssl_forums.$domain": + url => "https://forums.$domain/", + vhost => "forums.$domain", + use_ssl => true, + } + + include tld_redirections + + include libvirtd::kvm + include lists + include dns::server + include repositories::svn_mirror + include viewvc + + # disabled until fixed + #include repositories::git_mirror + include gitweb + + include xymon::server + apache::vhost_simple { "xymon.$domain": + location => "/var/lib/xymon/www", + } + + include youri-check::report + + include wikis +} diff --git a/manifests/nodes/champagne.pp b/manifests/nodes/champagne.pp new file mode 100644 index 00000000..bd722aba --- /dev/null +++ b/manifests/nodes/champagne.pp @@ -0,0 +1,19 @@ +node champagne { +# Location: gandi VM +# +# TODO: +# - setup mageia.org web site +# + include common::default_mageia_server + timezone::timezone { "Europe/Paris": } + include blog::files-bots + include blog::files_backup + include planet + include websites::static + include websites::hugs + include websites::releases + include websites::www + include dashboard::base + include access_classes::web + include openssh::ssh_keys_from_ldap +} diff --git a/manifests/nodes/ecosse.pp b/manifests/nodes/ecosse.pp new file mode 100644 index 00000000..e2b80924 --- /dev/null +++ b/manifests/nodes/ecosse.pp @@ -0,0 +1,7 @@ +node ecosse { +# Location: IELO datacenter (marseille) +# + include common::default_mageia_server + include buildsystem::buildnode + timezone::timezone { "Europe/Paris": } +} diff --git a/manifests/nodes/fiona.pp b/manifests/nodes/fiona.pp new file mode 100644 index 00000000..d47ebed8 --- /dev/null +++ b/manifests/nodes/fiona.pp @@ -0,0 +1,11 @@ +# backup server +node fiona { +# Location: IELO datacenter (marseille) +# +# TODO: +# - buy the server +# - install the server in datacenter +# - install a backup system + include common::default_mageia_server + timezone::timezone { "Europe/Paris": } +} diff --git a/manifests/nodes/friteuse.pp b/manifests/nodes/friteuse.pp new file mode 100644 index 00000000..59d4761a --- /dev/null +++ b/manifests/nodes/friteuse.pp @@ -0,0 +1,8 @@ +node friteuse { +# Location: VM hosted by nfrance (toulouse) +# + + include common::default_mageia_server + timezone::timezone { "Europe/Paris": } + include forums +} diff --git a/manifests/nodes/jonund.pp b/manifests/nodes/jonund.pp new file mode 100644 index 00000000..9211fe21 --- /dev/null +++ b/manifests/nodes/jonund.pp @@ -0,0 +1,11 @@ +# buildnode +node jonund { +# Location: IELO datacenter (marseille) +# + include common::default_mageia_server + include buildsystem::buildnode + include buildsystem::iurt20101 + timezone::timezone { "Europe/Paris": } + include shorewall + include shorewall::default_firewall +} diff --git a/manifests/nodes/krampouezh.pp b/manifests/nodes/krampouezh.pp new file mode 100644 index 00000000..7fb5ed32 --- /dev/null +++ b/manifests/nodes/krampouezh.pp @@ -0,0 +1,21 @@ +# gandi-vm +node krampouezh { +# Location: gandi VM +# +# + #include common::default_mageia_server + include common::default_mageia_server_no_smtp + include postfix::secondary_smtp + include blog::base + include blog::db_backup + include mysql::server + include dns::server + timezone::timezone { "Europe/Paris": } + + openldap::slave_instance { "1": + rid => 1, + } + +# Other services running on this server : +# - meetbot +} diff --git a/manifests/nodes/rabbit.pp b/manifests/nodes/rabbit.pp new file mode 100644 index 00000000..ff761245 --- /dev/null +++ b/manifests/nodes/rabbit.pp @@ -0,0 +1,58 @@ +node rabbit { +# Location: Server offered by Dedibox (paris) +# +# - used to create isos ( and live, and so on ) +# + include common::default_mageia_server + timezone::timezone { "Europe/Paris": } + include bcd::base + include bcd::web + include bcd::rsync + include draklive::base + include access_classes::iso_makers + include openssh::ssh_keys_from_ldap + include mirror::mageia + include mirror::newrelease + include releasekey::base + include youri-check::check + + # for testing iso quickly + include libvirtd::kvm + libvirtd::group_access { "mga-iso_makers": } + + # to ease the creation of test iso + $netinst_iso_path = "/var/lib/libvirt/netboot" + + file { $netinst_iso_path: + ensure => directory, + } + + libvirtd::storage { "netinst_iso": + path => $netinst_iso_path, + require => File[$netinst_iso_path], + } + + include auto_installation::download + auto_installation::download::netboot_images { "mandriva": + path => $netinst_iso_path, + versions => ["2010.0","2010.1"], + archs => ['i586','x86_64'], + mirror_path => "ftp://ftp.free.fr/pub/Distributions_Linux/MandrivaLinux/official/%{version}/%{arch}/install/images/", + files => ['boot.iso'], + require => File[$netinst_iso_path], + } + + # for testing pxe support of libvirt + include auto_installation::variables + libvirtd::network {"pxe_network": + network => "192.168.123.0/24", + tftp_root => $auto_installation::variables::pxe_dir, + bridge_name => "virbr1", + } + + include auto_installation::pxe_menu + auto_installation::mandriva_installation_entry { "pxe_test": + version => "2010.1", + arch => "i586", + } +} diff --git a/manifests/nodes/valstar.pp b/manifests/nodes/valstar.pp new file mode 100644 index 00000000..8bbc5077 --- /dev/null +++ b/manifests/nodes/valstar.pp @@ -0,0 +1,55 @@ +# svn, big important server +node valstar { +# Location: IELO datacenter (marseille) +# +# TODO: +# - GIT server +# - setup maintainers database (with web interface) +# + include common::default_mageia_server + timezone::timezone { "Europe/Paris": } + include main_mirror + include openldap::master + include subversion::client + include subversion::server + include puppet::master + include reports::ii + + include ssh::auth + include ssh::auth::keymaster + include buildsystem::mainnode + include buildsystem::mgacreatehome + include buildsystem::sync20101 + include buildsystem::release + include buildsystem::maintdb + include buildsystem::binrepo + include softwarekey::base + + include access_classes::committers + include restrictshell::allow_git + include restrictshell::allow_svn + include restrictshell::allow_pkgsubmit + include restrictshell::allow_maintdb + include restrictshell::allow_upload_bin + # disabled the ldap key here instead of disabling for the + # whole module ( see r698 ) + class { "openssh::ssh_keys_from_ldap": + symlink_users => ['schedbot', 'iurt'] + } + + include mirror::mdv2010spring + + include repositories::subversion + include repositories::git + include repositories::sparkleshare + + include websites::svn + + subversion::snapshot { "/etc/puppet": + source => "svn://svn.mageia.org/svn/adm/puppet/" + } + + mirror_cleaner::orphans { "cauldron": + base => "/distrib/bootstrap/distrib/", + } +} |