[NFS] On régularise un peu ce qu'il y a dans bcfg2, et on vire fx

Ignore-this: e5bb59e0b7ff8ec910e59d9c952c9118

darcs-hash:20120808201010-b6762-adb907150b3dc37de41ffe717887d430c6d94e97.gz
This commit is contained in:
Pierre-Elliott Bécue 2012-08-08 22:10:10 +02:00
parent b060eb03e0
commit 9734b7f2ed
3 changed files with 31 additions and 7 deletions

View file

@ -51,12 +51,14 @@
<ConfigFile name="/etc/sysctl.conf"/>
</Group>
<Group name="nfs">
<!-- fping est necessaire pour le script attendre-vert -->
<Package name="fping"/>
<Group name="crans-nfs-squeeze">
<Package name="nfs-kernel-server"/>
<Package name="quota"/>
<ConfigFile name="/etc/default/nfs-kernel-server"/>
<ConfigFile name="/etc/default/quota"/>
</Group>
<Group name="dom0">
<Group name="iscsi">
<Package name="open-iscsi"/>
<ConfigFile name="/etc/udev/rules.d/10_crans_iscsi.rules"/>
</Group>

View file

@ -39,6 +39,7 @@
<Group name="daath"
profile="true">
<Group name="crans-squeeze"/>
<Group name="adm-only"/>
</Group>
<Group name="sable"
@ -459,8 +460,9 @@
<Group name="crans-dom0-squeeze" public="true"
comment="groupe crans pour un dom0 sous squeeze">
<Group name="crans"/>
<Group name="dom0"/>
<Group name="dom0" />
<Group name="iscsi"/>
<Group name="rsyslog-client"/>
<Group name="squeeze"/>
<Group name="mail"/>
@ -476,6 +478,26 @@
<Bundle name="nagios"/>
</Group>
<Group name="crans-nfs-squeeze">
<Group name="crans"/>
<Group name="ssh"/>
<Group name="sudo"/>
<Group name="squeeze"/>
<Group name="mail"/>
<Group name="apt"/>
<Group name="secrets"/>
<Group name="bcfg2-client"/>
<Group name="backup-client"/>
<Group name="rsyslog-client"/>
<Group name="iscsi"/>
<Bundle name="apt"/>
<Bundle name="apt-keys"/>
<Bundle name="ntp"/>
<Bundle name="nagios"/>
<Bundle name="molly-guard"/>
</Group>
<!-- +=============================+ -->
<!-- | Composantes du groupe crans | -->
<!-- +=============================+ -->

View file

@ -17,7 +17,7 @@ print metadata.Probes["fstab_local"]
if has("nfs"):
@# Le nfs
mnt("fx.adm.crans.org:/usr/scripts", "/usr/scripts", "nfs", ["rw"])
mnt("daath.adm.crans.org:/usr/scripts", "/usr/scripts", "nfs", ["rw"])
if has("home-permanent"):
# Pour ceux qui accèdent beaucoup aux homes on monte tout le /home
mnt("fx.adm.crans.org:/home-adh", "/home", "nfs", ["rw"]);