modifs pour une premiere config utilisable
Adpatation pour que ce qui a deja ete fait soit utilisable en production. darcs-hash:20071203060833-af139-b5e8a4b71e909e071642e63b13f132808f2513b5.gz
This commit is contained in:
Jeremie Dimino
parent
a573da27c4
commit
2d0043d204
6 changed files with 236 additions and 67 deletions
|
|
@ -1,3 +1,5 @@
|
|||
<Base>
|
||||
<Group name="crans">
|
||||
<Package name="python"/>
|
||||
<Base/>
|
||||
</Group>
|
||||
</Base>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
<Base>
|
||||
<Group name="crans">
|
||||
<!-- Les paquets utiles pour l'utilisation de tous les jours -->
|
||||
<Package name="emacs"/>
|
||||
<Package name="zsh"/>
|
||||
<Package name="procinfo"/>
|
||||
<Package name="ipython"/>
|
||||
<Package name="less"/>
|
||||
</Group>
|
||||
</Base>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<Bundle name="ssh" version="2.0" revision="$Rev$"
|
||||
origin="$URL$">
|
||||
<Bundle name="ssh">
|
||||
<!-- Fichiers gere par le plugin SSHbase -->
|
||||
<ConfigFile name="/etc/ssh/ssh_host_dsa_key"/>
|
||||
<ConfigFile name="/etc/ssh/ssh_host_rsa_key"/>
|
||||
|
|
@ -8,7 +7,7 @@
|
|||
<ConfigFile name="/etc/ssh/ssh_host_key"/>
|
||||
<ConfigFile name="/etc/ssh/ssh_host_key.pub"/>
|
||||
<ConfigFile name="/etc/ssh/ssh_known_hosts"/>
|
||||
<!-->
|
||||
<!-- -->
|
||||
<ConfigFile name="/etc/ssh/sshd_config"/>
|
||||
<ConfigFile name="/etc/ssh/ssh_config"/>
|
||||
<Package name="ssh"/>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<Bundle name="sudo" version="2.0" revision="$Rev$"
|
||||
origin="$URL$">
|
||||
<Bundle name="sudo" version="2.0">
|
||||
<ConfigFile name="/etc/sudoers"/>
|
||||
<Package name="sudo"/>
|
||||
</Bundle>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,22 @@
|
|||
<!-- -*- mode: xml; coding: utf-8 -*- -->
|
||||
<Clients version="3.0">
|
||||
<Client name="bcfg2tmp0.adm.crans.org" profile="basic" pingable="Y" pingtime="0">
|
||||
<Client name="komaz.adm.crans.org" profile="komaz"/>
|
||||
<Client name="sila.adm.crans.org" profile="sila"/>
|
||||
<Client name="zamok.adm.crans.org" profile="zamok"/>
|
||||
<Client name="rouge.adm.crans.org" profile="rouge"/>
|
||||
<Client name="vert.adm.crans.org" profile="vert"/>
|
||||
<Client name="pegase.adm.crans.org" profile="pegase"/>
|
||||
<Client name="egon.adm.crans.org" profile="egon"/>
|
||||
<Client name="ovh.adm.crans.org" profile="ovh"/>
|
||||
<Client name="fx.adm.crans.org" profile="fx"/>
|
||||
<Client name="aslvid.adm.crans.org" profile="aslvid"/>
|
||||
<Client name="titanic.adm.crans.org" profile="titanic"/>
|
||||
<!-- La ferme -->
|
||||
<Client name="canard.adm.crans.org" profile="canard"/>
|
||||
<Client name="oie.adm.crans.org" profile="oie"/>
|
||||
<Client name="lapin.adm.crans.org" profile="lapin"/>
|
||||
<Client name="mouton.adm.crans.org" profile="mouton"/>
|
||||
<!-- Serveur de test -->
|
||||
<Client name="bcfg2tmp0.adm.crans.org" profile="bcfg2tmp0"/>
|
||||
<Client name="bcfg2tmp1.adm.crans.org" profile="bcfg2tmp1"/>
|
||||
</Clients>
|
||||
|
|
|
|||
|
|
@ -1,34 +1,113 @@
|
|||
<!-- -*- mode: xml; coding: utf-8 -*- -->
|
||||
<Groups version="3.0">
|
||||
|
||||
<!-- *** Definition des serveurs ***
|
||||
-->
|
||||
<!-- +=========================+ -->
|
||||
<!-- | Definition des serveurs | -->
|
||||
<!-- +=========================+ -->
|
||||
|
||||
<Group name="toto" profile="true">
|
||||
<Group name="basic"/>
|
||||
<Group name="mail-server"/>
|
||||
<Group name="komaz"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
</Group>
|
||||
|
||||
<Group name="sila"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
<Group name="db-replica"/>
|
||||
</Group>
|
||||
|
||||
<Group name="zamok"
|
||||
comment="le serveur des adherents"
|
||||
profile="true">
|
||||
<Group name="basic"/>
|
||||
<Group name="crans"/>
|
||||
<Group name="users"/>
|
||||
</Group>
|
||||
|
||||
<Group name="rouge"
|
||||
profile="true">
|
||||
<Group name="basic"/>
|
||||
<Group name="crans"/>
|
||||
<Group name="mail-mx-main"/>
|
||||
<Group name="mailing-list-manager"/>
|
||||
<Group name="news-server"/>
|
||||
</Group>
|
||||
|
||||
<!-- *** Le groupe minimal ***
|
||||
Le groupe basic est le groupe dans lequel tous les serveurs doivent
|
||||
se trouver. Il contient tout ce qui est vital a un serveur du Cr@ns.
|
||||
-->
|
||||
<Group name="vert"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
<Group name="db-main"/>
|
||||
</Group>
|
||||
|
||||
<Group name="basic" profile="true" public="true"
|
||||
<Group name="pegase"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
<Group name="db-replica"/>
|
||||
</Group>
|
||||
|
||||
<Group name="egon"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
</Group>
|
||||
|
||||
<Group name="ovh"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
<Group name="db-replica"/>
|
||||
</Group>
|
||||
|
||||
<Group name="fx"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
</Group>
|
||||
|
||||
<Group name="aslvid"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
</Group>
|
||||
|
||||
<Group name="titanic"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
</Group>
|
||||
|
||||
<Group name="canard"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
</Group>
|
||||
|
||||
<Group name="oie"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
</Group>
|
||||
|
||||
<Group name="lapin"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
</Group>
|
||||
|
||||
<Group name="mouton"
|
||||
profile="true">
|
||||
<Group name="crans"/>
|
||||
</Group>
|
||||
|
||||
<!-- profile de test -->
|
||||
|
||||
<Group name="bcfg2tmp0" profile="true">
|
||||
<Group name="crans"/>
|
||||
</Group>
|
||||
|
||||
<Group name="bcfg2tmp1" profile="true">
|
||||
<Group name="crans"/>
|
||||
<Group name="mail-mx-secondary"/>
|
||||
</Group>
|
||||
|
||||
<!-- +=================+ -->
|
||||
<!-- | Le groupe crans | -->
|
||||
<!-- +=================+ -->
|
||||
<!-- Le groupe crans est le groupe dans lequel tous les serveurs
|
||||
doivent se trouver. Il contient tout ce qui est vital a un
|
||||
serveur du Cr@ns. -->
|
||||
|
||||
<Group name="crans" profile="true" public="true"
|
||||
comment="groupe minimal pour un serveur du Crans"
|
||||
toolset="debian">
|
||||
<Group name="locale"/>
|
||||
|
|
@ -38,8 +117,9 @@
|
|||
<Group name="mail"/>
|
||||
</Group>
|
||||
|
||||
<!-- *** Composantes du groupe de basic ***
|
||||
-->
|
||||
<!-- +=============================+ -->
|
||||
<!-- | Composantes du groupe crans | -->
|
||||
<!-- +=============================+ -->
|
||||
|
||||
<Group name="locale"
|
||||
comment="gestion des locales">
|
||||
|
|
@ -49,41 +129,60 @@
|
|||
|
||||
<Group name="ssh"
|
||||
comment="client et serveur ssh">
|
||||
<Group name="db"/>
|
||||
<Group name="auth"/>
|
||||
<Bundle name="ssh"/>
|
||||
</Group>
|
||||
|
||||
<Group name="sudo">
|
||||
<Group name="db"/>
|
||||
<Group name="auth"/>
|
||||
<Bundle name="sudo"/>
|
||||
</Group>
|
||||
|
||||
<Group name="home"
|
||||
comment="montage automatique des homes">
|
||||
<!-- TODO: a implementer -->
|
||||
</Group>
|
||||
|
||||
<Group name="mail"
|
||||
comment="envoi de mail">
|
||||
<Group name="mail-backend"/>
|
||||
</Group>
|
||||
|
||||
<!-- +==========+ -->
|
||||
<!-- | Services | -->
|
||||
<!-- +==========+ -->
|
||||
<!-- Les groupes suivants sont les seuls qui doivent eventuellement
|
||||
etres ajoutes a la definition des serveurs. -->
|
||||
<!-- Ils definissent les services que l'on peut vouloir ajouter a un
|
||||
serveur, sans se soucier des programmes reellement utilises
|
||||
pour accomplir leur role. -->
|
||||
|
||||
<!-- *** Mail *** -->
|
||||
|
||||
<Group name="mail-mx-main"
|
||||
comment="mx principal de l'association"
|
||||
category="mail-mx">
|
||||
<Group name="mail-mx"/>
|
||||
<!-- Ca c'est pour distinguer les smtp qui ne sont utilise que en
|
||||
interne comme le serveur des adherents par exemple -->
|
||||
<Group name="mail-mx-public"/>
|
||||
</Group>
|
||||
|
||||
<Group name="mail-mx-secondary"
|
||||
comment="un mx secondaire"
|
||||
category="mail-mx">
|
||||
<Group name="mail-mx"/>
|
||||
<Group name="mail-mx-public"/>
|
||||
</Group>
|
||||
|
||||
<Group name="mailing-list-manager"
|
||||
comment="gestion des listes de diffusion">
|
||||
<Group name="mailman"/>
|
||||
<Group name="mailing-list-manager-backend"/>
|
||||
<!-- Mailman a besoin d'un smtp -->
|
||||
<Group name="mail-mx"/>
|
||||
</Group>
|
||||
|
||||
<!-- -->
|
||||
|
||||
<Group name="db"
|
||||
comment="acces a la base de donnee du crans">
|
||||
<Group name="db-backend"/>
|
||||
</Group>
|
||||
|
||||
<!-- -->
|
||||
|
||||
<Group name="users"
|
||||
comment="le serveur sur les adherent peuvent se logger">
|
||||
<!-- C'est aussi le serveur qui fait la delivrance local des mails -->
|
||||
<Group name="mail-mx"/>
|
||||
</Group>
|
||||
<!-- *** Base de donnee *** -->
|
||||
|
||||
<Group name="db-main"
|
||||
comment="le serveur qui contient la base du crans"
|
||||
|
|
@ -97,49 +196,96 @@
|
|||
<Group name="db-server"/>
|
||||
</Group>
|
||||
|
||||
<Group name="mail-mx-main"
|
||||
comment="smtp principal de l'association"
|
||||
category="mail-mx">
|
||||
<!-- *** Divers *** -->
|
||||
|
||||
<Group name="users"
|
||||
comment="le serveur sur lequel les adherent peuvent se logger">
|
||||
<!-- C'est aussi le serveur qui fait la delivrance local des mails -->
|
||||
<Group name="mail-mx"/>
|
||||
<!-- Ca c'est pour distinguer les smtp qui ne sont utilise que en interne
|
||||
comme le serveur des adherents par exemple -->
|
||||
<Group name="mail-mx-public"/>
|
||||
</Group>
|
||||
|
||||
<Group name="mail-mx-secondary"
|
||||
comment="serveur de recpetion des mails principal"
|
||||
category="mail-mx">
|
||||
<Group name="mail-mx"/>
|
||||
<Group name="mail-mx-public"/>
|
||||
<Group name="news-server"
|
||||
comment="serveur de news">
|
||||
<Group name="news-server-backend"/>
|
||||
</Group>
|
||||
|
||||
<!-- -->
|
||||
<!-- +=================================+ -->
|
||||
<!-- | Tous les groupes intermediaires | -->
|
||||
<!-- +=================================+ -->
|
||||
<!-- Les groupes suivant sont tous ceux qui se trouve entre la
|
||||
definition abstraite des services et les backends reellement
|
||||
utilises. -->
|
||||
|
||||
<!-- *** Mail *** -->
|
||||
|
||||
<Group name="mail-mx"
|
||||
comment="serveur qui fait MX (principal, secondaire on interne)">
|
||||
<Group name="mail-backend"/>
|
||||
</Group>
|
||||
|
||||
<!-- *** Base de donnee *** -->
|
||||
|
||||
<Group name="db"
|
||||
comment="acces a la base de donnee du crans">
|
||||
<Group name="db-backend"/>
|
||||
</Group>
|
||||
|
||||
<Group name="db-server"
|
||||
comment="un server qui possede la base en local">
|
||||
<Group name="db-backend"/>
|
||||
</Group>
|
||||
|
||||
<!-- -->
|
||||
<!-- *** Divers *** -->
|
||||
|
||||
<Group name="db-backend"
|
||||
comment="backend utilise pour la base de donnee">
|
||||
<Group name="ldap"/>
|
||||
<Group name="auth"
|
||||
comment="gestion de l'authentification">
|
||||
<Group name="auth-backend"/>
|
||||
<Group name="db"/>
|
||||
</Group>
|
||||
|
||||
<Group name="mail-backend"
|
||||
comment="backend utilise pour les mails">
|
||||
<!-- +===================================================+ -->
|
||||
<!-- | Configuration des backends utilises en production | -->
|
||||
<!-- +===================================================+ -->
|
||||
|
||||
<Group name="mail-backend">
|
||||
<Group name="postfix"/>
|
||||
</Group>
|
||||
|
||||
<Group name="mailing-list-manager-backend">
|
||||
<Group name="mailman"/>
|
||||
</Group>
|
||||
|
||||
<!-- *** Les backends ****
|
||||
<Group name="auth-backend">
|
||||
<Group name="pam"/>
|
||||
</Group>
|
||||
|
||||
<Group name="db-backend">
|
||||
<Group name="ldap"/>
|
||||
</Group>
|
||||
|
||||
<Group name="news-server-backend">
|
||||
<!-- TODO: a implementer -->
|
||||
</Group>
|
||||
|
||||
<!-- +==============+ -->
|
||||
<!-- | Les backends | -->
|
||||
<!-- +==============+ -->
|
||||
|
||||
<Group name="pam"
|
||||
comment="authentification par pam"
|
||||
category="auth-backend">
|
||||
<!-- TOTO: a implementer/completer/tester
|
||||
<Group name="db"/>
|
||||
<Bundle name="pam"/>
|
||||
-->
|
||||
</Group>
|
||||
|
||||
<Group name="ldap"
|
||||
comment="base de donnee ldap"
|
||||
category="db-backend">
|
||||
<!-- TOTO: a implementer/completer/tester
|
||||
<Bundle name="ldap"/>
|
||||
-->
|
||||
</Group>
|
||||
|
||||
<Group name="pgsql"
|
||||
|
|
@ -158,7 +304,9 @@
|
|||
|
||||
<Group name="mailman"
|
||||
category="mailing-list-manager-backend">
|
||||
<!-- TOTO: a implementer/completer/tester
|
||||
<Bundle name="mailman"/>
|
||||
-->
|
||||
</Group>
|
||||
|
||||
</Groups>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue