--- a/src/server/server.py	Mon Jun 09 20:37:42 2014 +0200
+++ b/src/server/server.py	Tue Jun 10 15:38:47 2014 +0200
@@ -111,11 +111,13 @@
 
     def waitForId(self, callback, action_id, profile, *args, **kwargs):
         """Wait for an action result
+
         @param callback: method to call when action gave a result back
         @param action_id: action_id to wait for
         @param profile: %(doc_profile)s
         @param *args: additional argument to pass to callback
-        @param **kwargs: idem"""
+        @param **kwargs: idem
+        """
         action_tuple = (action_id, profile)
         self.waiting_ids[action_tuple] = (callback, args, kwargs)
         reactor.callLater(self.ID_LIFETIME, self.purgeID, action_tuple)
@@ -1003,42 +1005,37 @@
 class Libervia(service.Service):
 
     DATA_DIR_DEFAULT = ''
-    OPT_PARAMETERS = [['connection_type', 't', 'https', "'http', 'https' or 'both' (to launch both servers).", coerceConnectionType],
-                      ['port', 'p', 8080, 'The port number to listen HTTP on.', int],
-                      ['port_https', 's', 8443, 'The port number to listen HTTPS on.', int],
-                      ['port_https_ext', 'e', 0, 'The external port number used for HTTPS (0 means port_https value).', int],
-                      ['ssl_certificate', 'c', 'libervia.pem', 'PEM certificate with both private and public parts.', str],
-                      ['redirect_to_https', 'r', 1, 'Automatically redirect from HTTP to HTTPS.', int],
-                      ['security_warning', 'w', 1, 'Warn user that he is about to connect on HTTP.', int],
-                      # FIXME: twistd bugs when printing 'à' on "Unknown command" error (works on normal command listing)
-                      ['passphrase', 'k', '', u"Passphrase for the SaT profile named '%s'" % C.SERVICE_PROFILE, str],
-                      ['data_dir', 'd', DATA_DIR_DEFAULT, u'Data directory for Libervia', coerceDataDir],
-                      ]
+    OPT_PARAMETERS_BOTH = [['connection_type', 't', 'https', _(u"'http', 'https' or 'both' (to launch both servers)."), coerceConnectionType],
+                           ['port', 'p', 8080, _(u'The port number to listen HTTP on.'), int],
+                           ['port_https', 's', 8443, _(u'The port number to listen HTTPS on.'), int],
+                           ['port_https_ext', 'e', 0, _(u'The external port number used for HTTPS (0 means port_https value).'), int],
+                           ['ssl_certificate', 'c', 'libervia.pem', _(u'PEM certificate with both private and public parts.'), str],
+                           ['redirect_to_https', 'r', 1, _(u'Automatically redirect from HTTP to HTTPS.'), int],
+                           ['security_warning', 'w', 1, _(u'Warn user that he is about to connect on HTTP.'), int],
+                           ['passphrase', 'k', '', _(u"Passphrase for the SàT profile named '%s'") % C.SERVICE_PROFILE, str],
+                           ['data_dir', 'd', DATA_DIR_DEFAULT, _(u'Data directory for Libervia'), coerceDataDir],
+                          ] # options which are in sat.conf and on command line, see https://twistedmatrix.com/documents/current/api/twisted.python.usage.Options.html
+    OPT_PARAMETERS_CFG = [] # Options which are in sat.conf only
 
     def __init__(self, *args, **kwargs):
-        if not kwargs:
-            # During the loading of the twisted plugins, we just need the default values.
-            # This part is not executed when the plugin is actually started.
-            for name, value in [(option[0], option[2]) for option in self.OPT_PARAMETERS]:
-                kwargs[name] = value
         self.initialised = defer.Deferred()
-        self.connection_type = kwargs['connection_type']
-        self.port = kwargs['port']
-        self.port_https = kwargs['port_https']
-        self.port_https_ext = kwargs['port_https_ext']
+
+        # options managing
+        for opt in self.OPT_PARAMETERS_BOTH + self.OPT_PARAMETERS_CFG:
+            opt_name = opt[0]
+            setattr(self, opt_name, kwargs.get(opt_name, opt[2]))
         if not self.port_https_ext:
             self.port_https_ext = self.port_https
-        self.ssl_certificate = kwargs['ssl_certificate']
-        self.redirect_to_https = kwargs['redirect_to_https']
-        self.security_warning = kwargs['security_warning']
-        self.passphrase = kwargs['passphrase']
-        self.data_dir = kwargs['data_dir']
         if self.data_dir == Libervia.DATA_DIR_DEFAULT:
             coerceDataDir(self.data_dir)  # this is not done when using the default value
+
         self.html_dir = os.path.join(self.data_dir, C.HTML_DIR)
         self.server_css_dir = os.path.join(self.data_dir, C.SERVER_CSS_DIR)
+
         self._cleanup = []
+
         root = ProtectedFile(self.html_dir)
+
         self.signal_handler = SignalHandler(self)
         _register = Register(self)
         _upload_radiocol = UploadManagerRadioCol(self)
@@ -1047,6 +1044,7 @@
         self.sessions = {}  # key = session value = user
         self.prof_connected = set()  # Profiles connected
         self.action_handler = SATActionIDHandler()
+
         ## bridge ##
         try:
             self.bridge = DBusBridgeFrontend()