diff --git a/conf/jmc.conf b/conf/jmc.conf index 55398a2..4e84aea 100644 --- a/conf/jmc.conf +++ b/conf/jmc.conf @@ -17,6 +17,10 @@ db_url: %(type)s://%(host)s%(name)s [component] pid_file: /var/run/jabber/jmc.pid +#motd: "Message of the day" +welcome_message: "Welcome to Jabber Mail Component" +# a comma separated list of JIDs +admins: admin@localhost [jmc] mail_default_encoding: iso-8859-1 diff --git a/src/jmc/runner.py b/src/jmc/runner.py index 450e39e..5f9ca28 100644 --- a/src/jmc/runner.py +++ b/src/jmc/runner.py @@ -57,10 +57,12 @@ class JMCRunner(JCLRunner): secret=self.secret, server=self.server, port=self.port, - lang=Lang(self.language)) + lang=Lang(self.language), + config=self.config, + config_file=self.config_file) MailAccount.default_encoding = self.mail_default_encoding component.check_interval = self.check_interval component.disco_identity.set_category("gateway") component.disco_identity.set_type("smtp") - component.run() + return component.run() self._run(run_func)