diff options
Diffstat (limited to 'manifests/nodes')
| -rw-r--r-- | manifests/nodes/alamut.pp | 93 | ||||
| -rw-r--r-- | manifests/nodes/arm1.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/arm2.pp | 5 | ||||
| -rw-r--r-- | manifests/nodes/armlet1.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/armlet2.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/champagne.pp | 19 | ||||
| -rw-r--r-- | manifests/nodes/duvel.pp | 56 | ||||
| -rw-r--r-- | manifests/nodes/ec2aa1.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/ec2aa2.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/ec2aa3.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/ec2x1.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/ec2x2.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/ecosse.pp | 4 | ||||
| -rw-r--r-- | manifests/nodes/fiona.pp | 5 | ||||
| -rw-r--r-- | manifests/nodes/friteuse.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/jonund.pp | 11 | ||||
| -rw-r--r-- | manifests/nodes/krampouezh.pp | 21 | ||||
| -rw-r--r-- | manifests/nodes/ncaa1.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/neru.pp | 45 | ||||
| -rw-r--r-- | manifests/nodes/ociaa1.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/pktaa1.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/rabbit.pp | 78 | ||||
| -rw-r--r-- | manifests/nodes/sucuk.pp | 129 | ||||
| -rw-r--r-- | manifests/nodes/valstar.pp | 71 |
24 files changed, 323 insertions, 298 deletions
diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp deleted file mode 100644 index cb650aef..00000000 --- a/manifests/nodes/alamut.pp +++ /dev/null @@ -1,93 +0,0 @@ -# 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", - } - - youri-check::report_www {"check": } - - youri-check::config {"config_cauldron": - version => "cauldron", - } - youri-check::report {"report_cauldron": - version => "cauldron", - hour => "*", - minute => 24 - } - - youri-check::config {"config_1": - version => "1", - } - youri-check::report {"report_1": - version => "1", - hour => "*", - minute => 54 - } - - include wikis - include websites::pkgcpan -} diff --git a/manifests/nodes/arm1.pp b/manifests/nodes/arm1.pp deleted file mode 100644 index 5cf27c5b..00000000 --- a/manifests/nodes/arm1.pp +++ /dev/null @@ -1,7 +0,0 @@ -node arm1 { -# Location: IELO datacenter (marseille) - include common::default_mageia_server - timezone::timezone { "Europe/Paris": } - - -} diff --git a/manifests/nodes/arm2.pp b/manifests/nodes/arm2.pp deleted file mode 100644 index 94700892..00000000 --- a/manifests/nodes/arm2.pp +++ /dev/null @@ -1,5 +0,0 @@ -node arm2 { -# Location: IELO datacenter (marseille) - include common::default_mageia_server - timezone::timezone { "Europe/Paris": } -} diff --git a/manifests/nodes/armlet1.pp b/manifests/nodes/armlet1.pp new file mode 100644 index 00000000..0d731f08 --- /dev/null +++ b/manifests/nodes/armlet1.pp @@ -0,0 +1,7 @@ +node armlet1 { +# Location: Scaleway (Iliad/Online datacenter) +# + include common::default_mageia_server + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes/armlet2.pp b/manifests/nodes/armlet2.pp new file mode 100644 index 00000000..7566249f --- /dev/null +++ b/manifests/nodes/armlet2.pp @@ -0,0 +1,7 @@ +node armlet2 { +# Location: Scaleway (Iliad/Online datacenter) +# + include common::default_mageia_server + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes/champagne.pp b/manifests/nodes/champagne.pp deleted file mode 100644 index bd722aba..00000000 --- a/manifests/nodes/champagne.pp +++ /dev/null @@ -1,19 +0,0 @@ -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/duvel.pp b/manifests/nodes/duvel.pp new file mode 100644 index 00000000..772e43dc --- /dev/null +++ b/manifests/nodes/duvel.pp @@ -0,0 +1,56 @@ +node duvel { +# 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 git::client + include subversion::client + include subversion::server + include puppet::master + #include reports::ii + + include sshkeys::keymaster + include mga_buildsystem::mainnode + include softwarekey + include mgasoft + include spec-tree-reports + + 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 + include openssh::ssh_keys_from_ldap + + include repositories::subversion + + # include irkerd + + include websites::svn + include websites::git + + class { 'mga-advisories': + vhost => "advisories.${::domain}", + } + + git::snapshot { '/etc/puppet': + source => "git://git.${::domain}/infrastructure/puppet/" + } + + mirror_cleaner::orphans { 'cauldron': + base => '/distrib/bootstrap/distrib/', + } + + class { 'mgagit': + ldap_server => "ldap.${::domain}", + binddn => 'cn=mgagit-valstar,ou=System Accounts,dc=mageia,dc=org', + bindpw => extlookup('mgagit_ldap','x'), + } +} diff --git a/manifests/nodes/ec2aa1.pp b/manifests/nodes/ec2aa1.pp new file mode 100644 index 00000000..f000db8a --- /dev/null +++ b/manifests/nodes/ec2aa1.pp @@ -0,0 +1,7 @@ +node ec2aa1 { +# Location: Amazon (eu-central-1a) +# + include common::default_mageia_server + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes/ec2aa2.pp b/manifests/nodes/ec2aa2.pp new file mode 100644 index 00000000..a4e1e27f --- /dev/null +++ b/manifests/nodes/ec2aa2.pp @@ -0,0 +1,7 @@ +node ec2aa2 { +# Location: Amazon (eu-central-1b) +# + include common::default_mageia_server + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes/ec2aa3.pp b/manifests/nodes/ec2aa3.pp new file mode 100644 index 00000000..763675d7 --- /dev/null +++ b/manifests/nodes/ec2aa3.pp @@ -0,0 +1,7 @@ +node ec2aa3 { +# Location: Amazon (eu-central-1b) +# + include common::default_mageia_server + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes/ec2x1.pp b/manifests/nodes/ec2x1.pp new file mode 100644 index 00000000..4a0f5a0f --- /dev/null +++ b/manifests/nodes/ec2x1.pp @@ -0,0 +1,7 @@ +node ec2x1 { +# Location: Amazon (eu-central-1b) +# + include common::default_mageia_server + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes/ec2x2.pp b/manifests/nodes/ec2x2.pp new file mode 100644 index 00000000..bf25cf8e --- /dev/null +++ b/manifests/nodes/ec2x2.pp @@ -0,0 +1,7 @@ +node ec2x2 { +# Location: Amazon (eu-central-1a) +# + include common::default_mageia_server + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes/ecosse.pp b/manifests/nodes/ecosse.pp index e2b80924..c7fa95e5 100644 --- a/manifests/nodes/ecosse.pp +++ b/manifests/nodes/ecosse.pp @@ -2,6 +2,6 @@ node ecosse { # Location: IELO datacenter (marseille) # include common::default_mageia_server - include buildsystem::buildnode - timezone::timezone { "Europe/Paris": } + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } } diff --git a/manifests/nodes/fiona.pp b/manifests/nodes/fiona.pp index d47ebed8..2093001a 100644 --- a/manifests/nodes/fiona.pp +++ b/manifests/nodes/fiona.pp @@ -3,9 +3,8 @@ 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": } + timezone::timezone { 'Europe/Paris': } +# include backups::server } diff --git a/manifests/nodes/friteuse.pp b/manifests/nodes/friteuse.pp index 59d4761a..b096021e 100644 --- a/manifests/nodes/friteuse.pp +++ b/manifests/nodes/friteuse.pp @@ -1,8 +1,7 @@ node friteuse { -# Location: VM hosted by nfrance (toulouse) -# - +# Location: VM hosted on sucuk +# include common::default_mageia_server - timezone::timezone { "Europe/Paris": } + timezone::timezone { 'Europe/Paris': } include forums } diff --git a/manifests/nodes/jonund.pp b/manifests/nodes/jonund.pp deleted file mode 100644 index 5f0b0296..00000000 --- a/manifests/nodes/jonund.pp +++ /dev/null @@ -1,11 +0,0 @@ -# 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 deleted file mode 100644 index 7fb5ed32..00000000 --- a/manifests/nodes/krampouezh.pp +++ /dev/null @@ -1,21 +0,0 @@ -# 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/ncaa1.pp b/manifests/nodes/ncaa1.pp new file mode 100644 index 00000000..b512939a --- /dev/null +++ b/manifests/nodes/ncaa1.pp @@ -0,0 +1,7 @@ +node ncaa1 { +# Location: Netcup, Vienna +# + include common::default_mageia_server + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes/neru.pp b/manifests/nodes/neru.pp new file mode 100644 index 00000000..66958059 --- /dev/null +++ b/manifests/nodes/neru.pp @@ -0,0 +1,45 @@ +node neru { +# Location: Scaleway Paris +# + include common::default_mageia_server_no_smtp + timezone::timezone { 'Europe/Paris': } + include postfix::server::secondary + include blog::base + include blog::db_backup + include blog::files_bots + include blog::files_backup + include mysql::server + include dns::server + + include planet + include websites::archives + include websites::static + include websites::hugs + include websites::releases + include websites::www + include websites::doc + include websites::start + include websites::meetbot + include dashboard + include access_classes::web + include openssh::ssh_keys_from_ldap + + # temporary redirects for madb (2024-11) until it gets hosted on Mageia infra + apache::vhost_redirect { "madb.${::domain}": + url => "https://madb.mageialinux-online.org/", + } + apache::vhost_redirect { "ssl_madb.${::domain}": + use_ssl => true, + vhost => "madb.${::domain}", + url => "https://madb.mageialinux-online.org/", + } + + openldap::slave_instance { '1': + rid => 1, + } + + # http server for meetbot logs + include apache::base +} +# Other services running on this server : +# - meetbot diff --git a/manifests/nodes/ociaa1.pp b/manifests/nodes/ociaa1.pp new file mode 100644 index 00000000..ce476665 --- /dev/null +++ b/manifests/nodes/ociaa1.pp @@ -0,0 +1,7 @@ +node ociaa1 { +# Location: ? +# + include common::default_mageia_server + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes/pktaa1.pp b/manifests/nodes/pktaa1.pp new file mode 100644 index 00000000..31f649c4 --- /dev/null +++ b/manifests/nodes/pktaa1.pp @@ -0,0 +1,7 @@ +node pktaa1 { +# Location: Equinix Metal / SV - SJC1 +# + include common::default_mageia_server + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes/rabbit.pp b/manifests/nodes/rabbit.pp index 4f91a6ed..2436219b 100644 --- a/manifests/nodes/rabbit.pp +++ b/manifests/nodes/rabbit.pp @@ -1,74 +1,32 @@ node rabbit { -# Location: Server offered by Dedibox (paris) -# +# Location: IELO datacenter (marseille) +# # - used to create isos ( and live, and so on ) -# +# include common::default_mageia_server - timezone::timezone { "Europe/Paris": } + timezone::timezone { 'Europe/Paris': } include bcd::base - include bcd::web + #include bcd::web include bcd::rsync - include draklive::base + include mga_buildsystem::buildnode + include draklive + include git::svn include access_classes::iso_makers include openssh::ssh_keys_from_ldap - include mirror::mageia - include mirror::newrelease - include releasekey::base + # include mirror::mageia + include releasekey - youri-check::config {"config_cauldron": - version => "cauldron", + youri-check::config {'config_cauldron': + version => 'cauldron', } - youri-check::check {"check_cauldron": - version => "cauldron", - hour => "*", - minute => 4 - } - youri-check::config {"config_1": - version => "1", - } - youri-check::check {"check_1": - version => "1", - hour => "*/2", - minute => 30 + youri-check::check {'check_cauldron': + version => 'cauldron', + hour => '1-23/2', + minute => 30 } # 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], - } + # include libvirtd::kvm + # libvirtd::group_access { 'mga-iso_makers': } - # 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/sucuk.pp b/manifests/nodes/sucuk.pp index d8196ac8..e56fd113 100644 --- a/manifests/nodes/sucuk.pp +++ b/manifests/nodes/sucuk.pp @@ -1,6 +1,131 @@ # server for various task node sucuk { # Location: IELO datacenter (marseille) - include common::default_mageia_server - timezone::timezone { "Europe/Paris": } + include common::default_mageia_server_no_smtp + timezone::timezone { 'Europe/Paris': } + + include openssh::ssh_keys_from_ldap + include access_classes::admin + + include postgresql::server + postgresql::tagged { 'default': } + + class {'epoll::var': + db_password => extlookup('epoll_pgsql','x'), + password => extlookup('epoll_password','x'), + } + + #include epoll + #include epoll::create_db + + include sympa::server + include postfix::server::primary + include lists + + include catdap + include mga-mirrors + + include wikis + include websites::perl + include websites::www + include websites::nav + + include bugzilla + + # gitweb + include repositories::git_mirror + include cgit + include gitmirror + + include repositories::svn_mirror + include viewvc + +# include mirrorbrain + + include dns::server + + include xymon::server + apache::vhost_simple { "xymon.${::domain}": + location => '/usr/share/xymon/www', + } + + class { 'mgapeople': + ldap_server => "ldap.${::domain}", + binddn => 'cn=mgapeople-alamut,ou=System Accounts,dc=mageia,dc=org', + bindpw => extlookup('mgapeople_ldap','x'), + vhost => "people.${::domain}", + vhostdir => "/var/www/vhosts/people.${::domain}", + maintdburl => "https://pkgsubmit.${::domain}/data/maintdb.txt", + } + + class { 'mga-treasurer': + vhost => "treasurer.${::domain}", + vhostdir => "/var/www/vhosts/treasurer.${::domain}", + } + + youri-check::report_www { 'check': } + + youri-check::createdb_user {'config_cauldron': + version => 'cauldron', + } + + youri-check::config {'config_cauldron': + version => 'cauldron', + } + youri-check::report { 'report_cauldron': + version => 'cauldron', + hour => '*/2', + minute => '0' + } + + youri-check::createdb_user {'config_9': + version => '9', + } + + youri-check::config {'config_9': + version => '9', + } + + youri-check::report {'report_9': + version => '9', + hour => '*/4', + minute => '56' + } + + include tld_redirections + + # temporary, just the time the vm is running there + host { 'friteuse': + ensure => 'present', + ip => '192.168.122.131', + host_aliases => [ "friteuse.${::domain}", "forums.${::domain}" ], + } + + # to create all phpbb database on sucuk + 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, + } + + # forums is running in a VM on the machine so https: isn't necessary + apache::vhost::reverse_proxy { "ssl_forums.${::domain}": + url => "http://forums.${::domain}/", + vhost => "forums.${::domain}", + use_ssl => true, + content => ' + RewriteEngine On + RewriteCond %{QUERY_STRING} mode=register + RewriteRule .*ucp.php - [forbidden] + ', + } + + include libvirtd::kvm + } diff --git a/manifests/nodes/valstar.pp b/manifests/nodes/valstar.pp deleted file mode 100644 index bd3945db..00000000 --- a/manifests/nodes/valstar.pp +++ /dev/null @@ -1,71 +0,0 @@ -# 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 mgasoft - - 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/", - } - - # TODO use a dns zone for that - host { 'arm1': - ip => '10.10.10.11', - host_aliases => [ "arm1.$domain" ], - ensure => present, - } - - host { 'arm2': - ip => '10.10.10.12', - host_aliases => [ "arm2.$domain" ], - ensure => present, - } - - -} |
