diff options
| author | Olivier Blin <mageia@blino.org> | 2016-02-06 22:28:12 +0100 |
|---|---|---|
| committer | Olivier Blin <dev@blino.org> | 2016-02-07 02:09:32 +0100 |
| commit | baea4012f6052f573d080215265cfb2059703ba5 (patch) | |
| tree | ce605342f123a394b086ce81da2927feb60d267a | |
| parent | ac9c784dbd6b606e9829a97813719389b4390cef (diff) | |
| download | puppet-baea4012f6052f573d080215265cfb2059703ba5.tar puppet-baea4012f6052f573d080215265cfb2059703ba5.tar.gz puppet-baea4012f6052f573d080215265cfb2059703ba5.tar.bz2 puppet-baea4012f6052f573d080215265cfb2059703ba5.tar.xz puppet-baea4012f6052f573d080215265cfb2059703ba5.zip | |
make duvel the master host
| -rw-r--r-- | manifests/nodes/duvel.pp | 49 | ||||
| -rw-r--r-- | manifests/nodes/valstar.pp | 50 |
2 files changed, 49 insertions, 50 deletions
diff --git a/manifests/nodes/duvel.pp b/manifests/nodes/duvel.pp index 9928cbd6..9d435a18 100644 --- a/manifests/nodes/duvel.pp +++ b/manifests/nodes/duvel.pp @@ -1,5 +1,54 @@ 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 access_classes::committers + 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/valstar.pp b/manifests/nodes/valstar.pp index a96a0f9f..e086e548 100644 --- a/manifests/nodes/valstar.pp +++ b/manifests/nodes/valstar.pp @@ -1,55 +1,5 @@ -# 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 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 access_classes::committers - 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'), - } } |