diff --git a/Cfg/etc/default/nfs-common/nfs-common b/Cfg/etc/default/nfs-common/nfs-common
index a8d44ed..5d2990e 100644
--- a/Cfg/etc/default/nfs-common/nfs-common
+++ b/Cfg/etc/default/nfs-common/nfs-common
@@ -18,4 +18,5 @@ NEED_IDMAPD=no
 # Do you want to start the gssd daemon? It is required for Kerberos mounts.
 NEED_GSSD=
 
+# Serverside, allow lockd to listen for locks
 NEED_LOCKD=yes
diff --git a/Cfg/etc/xen/ldap/ldap b/Cfg/etc/xen/ldap/ldap
index ec4a6a6..44bef1e 100644
--- a/Cfg/etc/xen/ldap/ldap
+++ b/Cfg/etc/xen/ldap/ldap
@@ -1,6 +1,6 @@
 # -*- coding: utf-8; mode: python -*-
 
-execfile("/etc/xen/common_squeeze.py")
+execfile("/etc/xen/common_wheezy.py")
 
 name = "ldap"
 
diff --git a/Cfg/etc/xen/titanic/titanic b/Cfg/etc/xen/titanic/titanic
index 905d8e5..950e501 100644
--- a/Cfg/etc/xen/titanic/titanic
+++ b/Cfg/etc/xen/titanic/titanic
@@ -1,6 +1,6 @@
 # -*- coding: utf-8; mode: python -*-
 
-execfile("/etc/xen/common_squeeze.py")
+execfile("/etc/xen/common_wheezy.py")
 
 name = "titanic"
 
diff --git a/Metadata/clients.xml b/Metadata/clients.xml
index d105f07..859f4b6 100644
--- a/Metadata/clients.xml
+++ b/Metadata/clients.xml
@@ -45,6 +45,7 @@
   <Client name="cas.adm.crans.org" profile="cas" pingable="Y"/>
   <Client name="nem.adm.crans.org" profile="nem" pingable="Y"/>
   <Client name="isc.adm.crans.org" profile="isc" pingable="Y"/>
+  <Client name="roundcube.adm.crans.org" profile="roundcube" pingable="Y"/>
   <Client name="schrodingred.adm.crans.org" profile="schrodingred" pingable="Y"/>
 
   <!-- La ferme -->
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 3a4b7d2..dc6f452 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -12,8 +12,7 @@
     <Group name="firewall"/>
     <Group name="comptage-upload"/>
     <Group name="connection-main"/>
-<!-- <Group name="ups-monitor"/> -->
-	 <Group name="firmware-bnx2"/>
+	<Group name="firmware-bnx2"/>
     <Group name="vlan-ens"/>
     <Group name="vlan-wifi" />
     <Group name="nginx" comment="Proxy web et pages déco"/> 
@@ -23,11 +22,10 @@
 
   <Group name="charybde"
      profile="true">
-    <Group name="crans-squeeze"/>
+    <Group name="crans-wheezy"/>
     <Group name="dnssec-validation"/>
     <Group name="dns-recursif"/>
     <Group name="main-ftp-server"/>
-<!-- <Group name="ups-monitor"/> -->
     <Group name="debian-mirror"/>
     <Group name="webmasters"/>
     <Group name="ntp-server"/>
@@ -42,6 +40,13 @@
     <Group name="dns-recursif"/>
   </Group>
 
+  <Group name="roundcube"
+     profile="true">
+    <Group name="crans-domu-wheezy"/>
+    <Group name="nginx" comment="Pour roundcube" />
+    <Group name="php" comment="Pour roundcube" />
+  </Group>
+
   <Group name="zbee"
      profile="true">
     <Group name="firmware-bnx2"/>
@@ -140,7 +145,7 @@
     <Group name="db-main"/>
 <!-- <Group name="ups-server"/> -->
     <Group name="non-vlan-adherent"/>
-    <Group name="crans-domu-squeeze"/>
+    <Group name="crans-domu-wheezy"/>
   </Group>
 
   <Group name="babar"
@@ -208,7 +213,7 @@
     <Group name="dns-secondary-no-forward"/>
     <Group name="dns-recursif"/>
     <Group name="connection-rescue"/>
-    <Group name="crans-domu-squeeze"/>
+    <Group name="crans-domu-wheezy"/>
   </Group>
 
   <Group name="eap"
diff --git a/Python/etc/apt/sources.list b/Python/etc/apt/sources.list
index b4bae40..3c346c8 100644
--- a/Python/etc/apt/sources.list
+++ b/Python/etc/apt/sources.list
@@ -37,9 +37,8 @@ else:
     
     @# Dépôt classique
     source("%s/debian %s %s" % (repo, distro, components))
-    if distro != "wheezy":
-        @# Dépôt pour mises à jour fréquentes (volatile)
-        source("%s/debian %s-updates %s" % (repo, distro, components))
+    @# Dépôt pour mises à jour fréquentes (volatile)
+    source("%s/debian %s-updates %s" % (repo, distro, components))
 
     @# Paquets construits à la main
     source("%s/custom %s %s" % (repo, distro, components))
diff --git a/Python/etc/nagios/nrpe.cfg b/Python/etc/nagios/nrpe.cfg
index 9c94332..02547bb 100644
--- a/Python/etc/nagios/nrpe.cfg
+++ b/Python/etc/nagios/nrpe.cfg
@@ -13,32 +13,192 @@ http://nagios.sourceforge.net/docs/nrpe/NRPE.pdf
 http://wiki.crans.org/CransTechnique/ConfigurationNagios
 """)
 
-@# NRPE Config
+@# LOG FACILITY
+@# The syslog facility that should be used for logging purposes.
 @
 @log_facility=daemon
-@pid_file=/var/run/nagios/nrpe.pid
-@server_port=5666
-%server_address = admip()
-@nrpe_user=nagios
-@nrpe_group=nagios
-@allowed_hosts=10.231.136.81
 @
-@# Autorise le client NRPE à passer des commentaires
+@# PID FILE
+@# The name of the file in which the NRPE daemon should write it's process ID
+@# number.  The file is only written if the NRPE daemon is started by the root
+@# user and is running in standalone mode.
+@
+@pid_file=/var/run/nagios/nrpe.pid
+@
+@# PORT NUMBER
+@# Port number we should wait for connections on.
+@# NOTE: This must be a non-priviledged port (i.e. > 1024).
+@# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
+@
+@server_port=5666
+@
+@# SERVER ADDRESS
+@# Address that nrpe should bind to in case there are more than one interface
+@# and you do not want nrpe to bind on all interfaces.
+@# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
+@
+%server_address=admip()
+@
+@# NRPE USER
+@# This determines the effective user that the NRPE daemon should run as.  
+@# You can either supply a username or a UID.
+@# 
+@# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
+@
+@nrpe_user=nagios
+@
+@# NRPE GROUP
+@# This determines the effective group that the NRPE daemon should run as.  
+@# You can either supply a group name or a GID.
+@# 
+@# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
+@
+@nrpe_group=nagios
+@
+@# ALLOWED HOST ADDRESSES
+@# This is an optional comma-delimited list of IP address or hostnames 
+@# that are allowed to talk to the NRPE daemon. Network addresses with a bit mask
+@# (i.e. 192.168.1.0/24) are also supported. Hostname wildcards are not currently 
+@# supported.
+@#
+@# Note: The daemon only does rudimentary checking of the client's IP
+@# address.  I would highly recommend adding entries in your /etc/hosts.allow
+@# file to allow only the specified host to connect to the port
+@# you are running this daemon on.
+@#
+@# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
+@
+@allowed_hosts=10.231.136.81
+@ 
+@# COMMAND ARGUMENT PROCESSING
+@# This option determines whether or not the NRPE daemon will allow clients
+@# to specify arguments to commands that are executed.  This option only works
+@# if the daemon was configured with the --enable-command-args configure script
+@# option.  
+@#
+@# *** ENABLING THIS OPTION IS A SECURITY RISK! *** 
+@# Read the SECURITY file for information on some of the security implications
+@# of enabling this variable.
+@#
+@# Values: 0=do not allow arguments, 1=allow command arguments
+@
 @dont_blame_nrpe=1
 @
-@# Prefix commands
-@# command_prefix=/usr/bin/sudo
+@# COMMAND PREFIX
+@# This option allows you to prefix all commands with a user-defined string.
+@# A space is automatically added between the specified prefix string and the
+@# command line from the command definition.
+@#
+@# *** THIS EXAMPLE MAY POSE A POTENTIAL SECURITY RISK, SO USE WITH CAUTION! ***
+@# Usage scenario: 
+@# Execute restricted commmands using sudo.  For this to work, you need to add
+@# the nagios user to your /etc/sudoers.  An example entry for alllowing 
+@# execution of the plugins from might be:
+@#
+@# nagios          ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/
+@#
+@# This lets the nagios user run all commands in that directory (and only them)
+@# without asking for a password.  If you do this, make sure you don't give
+@# random users write access to that directory or its contents!
+@
+@# command_prefix=/usr/bin/sudo 
+@
+@# DEBUGGING OPTION
+@# This option determines whether or not debugging messages are logged to the
+@# syslog facility.
+@# Values: 0=debugging off, 1=debugging on
 @
-@# Activate debug with debug=1
 @debug=0
 @
+@# COMMAND TIMEOUT
+@# This specifies the maximum number of seconds that the NRPE daemon will
+@# allow plugins to finish executing before killing them off.
+@
 @command_timeout=60
 @
+@# CONNECTION TIMEOUT
+@# This specifies the maximum number of seconds that the NRPE daemon will
+@# wait for a connection to be established before exiting. This is sometimes
+@# seen where a network problem stops the SSL being established even though
+@# all network sessions are connected. This causes the nrpe daemons to
+@# accumulate, eating system resources. Do not set this too low.
+@
 @connection_timeout=300
 @
+@# WEEK RANDOM SEED OPTION
+@# This directive allows you to use SSL even if your system does not have
+@# a /dev/random or /dev/urandom (on purpose or because the necessary patches
+@# were not applied). The random number generator will be seeded from a file
+@# which is either a file pointed to by the environment valiable $RANDFILE
+@# or $HOME/.rnd. If neither exists, the pseudo random number generator will
+@# be initialized and a warning will be issued.
+@# Values: 0=only seed from /dev/[u]random, 1=also seed from weak randomness
+@
+@#allow_weak_random_seed=1
+@
+@
+@
+@# INCLUDE CONFIG FILE
+@# This directive allows you to include definitions from an external config file.
+@
+@#include=<somefile.cfg>
+@
+@
+@
+@# INCLUDE CONFIG DIRECTORY
+@# This directive allows you to include definitions from config files (with a
+@# .cfg extension) in one or more directories (with recursion).
+@
+@#include_dir=<somedirectory>
+@#include_dir=<someotherdirectory>
+@
+@
+@
+@# COMMAND DEFINITIONS
+@# Command definitions that this daemon will run.  Definitions
+@# are in the following format:
+@#
+@# command[<command_name>]=<command_line>
+@#
+@# When the daemon receives a request to return the results of <command_name>
+@# it will execute the command specified by the <command_line> argument.
+@#
+@# Unlike Nagios, the command line cannot contain macros - it must be
+@# typed exactly as it should be executed.
+@#
+@# Note: Any plugins that are used in the command lines must reside
+@# on the machine that this daemon is running on!  The examples below
+@# assume that you have plugins installed in a /usr/local/nagios/libexec
+@# directory.  Also note that you will have to modify the definitions below
+@# to match the argument format the plugins expect.  Remember, these are
+@# examples only!
+@
+@
+@# The following examples use hardcoded command arguments...
+@
 @command[check_users]=/usr/lib/nagios/plugins/check_users -w $ARG1$ -c $ARG2$
 @command[check_load]=/usr/lib/nagios/plugins/check_load -w $ARG1$ -c $ARG2$
 @command[check_all_disks]=/usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$
 @command[check_procs]=/usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$
 
 
+@# The following examples allow user-supplied arguments and can
+@# only be used if the NRPE daemon was compiled with support for 
+@# command arguments *AND* the dont_blame_nrpe directive in this
+@# config file is set to '1'.  This poses a potential security risk, so
+@# make sure you read the SECURITY file before doing this.
+@
+@#command[check_users]=/usr/lib/nagios/plugins/check_users -w $ARG1$ -c $ARG2$
+@#command[check_load]=/usr/lib/nagios/plugins/check_load -w $ARG1$ -c $ARG2$
+@#command[check_disk]=/usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+@#command[check_procs]=/usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
+@
+@#
+@# local configuration:
+@#       if you'd prefer, you can instead place directives here
+@include=/etc/nagios/nrpe_local.cfg
+@
+@# 
+@# you can place your config snipplets into nrpe.d/
+@# only snipplets ending in .cfg will get included
+@include_dir=/etc/nagios/nrpe.d/