--- a/cwconfig.py	Wed Sep 30 21:06:09 2009 +0200
+++ b/cwconfig.py	Thu Oct 01 08:49:29 2009 +0200
@@ -168,20 +168,26 @@
           'help': 'server\'s log level',
           'group': 'main', 'inputlevel': 1,
           }),
-        # pyro name server
+        # pyro options
+        ('pyro-instance-id',
+         {'type' : 'string',
+          'default': Method('default_instance_id'),
+          'help': 'identifier of the CubicWeb instance in the Pyro name server',
+          'group': 'pyro', 'inputlevel': 1,
+          }),
         ('pyro-ns-host',
          {'type' : 'string',
           'default': '',
           'help': 'Pyro name server\'s host. If not set, will be detected by a \
 broadcast query. It may contains port information using <host>:<port> notation.',
-          'group': 'pyro-name-server', 'inputlevel': 1,
+          'group': 'pyro', 'inputlevel': 1,
           }),
         ('pyro-ns-group',
          {'type' : 'string',
           'default': 'cubicweb',
           'help': 'Pyro name server\'s group where the repository will be \
 registered.',
-          'group': 'pyro-name-server', 'inputlevel': 1,
+          'group': 'pyro', 'inputlevel': 1,
           }),
         # common configuration options which are potentially required as soon as
         # you're using "base" application objects (ie to really server/web