patch cbc19fde23bb1d3fff242dae13a40ab86514c3de

Author: E. Bosch <presidev@AT@gmail.com>

Date: Wed Feb 16 01:58:19 CET 2022

* Order config options

--- old-irgramd/irgramd 2024-11-22 22:24:51.142218831 +0100

+++ new-irgramd/irgramd 2024-11-22 22:24:51.142218831 +0100

@@ -58,18 +58,18 @@

if __name__ == '__main__':

logger = logging.getLogger()

- tornado.options.define('config', default='irgramdrc', metavar='CONFIGFILE', help='Config file absolute or relative to `config_dir` (command line options override it)')

tornado.options.define('address', default=None, metavar='ADDRESS', help='Address to listen on.')

- tornado.options.define('port', default=None, metavar='PORT', help='Port to listen on. (default 6667, default with TLS 6697)')

+ tornado.options.define('config', default='irgramdrc', metavar='CONFIGFILE', help='Config file absolute or relative to `config_dir` (command line options override it)')

tornado.options.define('config_dir', default='~/.config/irgramd', metavar='PATH', help='Configuration directory where telegram session info is saved')

- tornado.options.define('tls', default=False, help='Use TLS/SSL encrypted connection for IRC server')

- tornado.options.define('tls_cert', default=None, metavar='CERTFILE', help='IRC server certificate chain for TLS/SSL, also can contain private key if not defined with `tls_key`')

- tornado.options.define('tls_key', default=None, metavar='KEYFILE', help='IRC server private key for TLS/SSL')

+ tornado.options.define('irc_nicks', type=str, multiple=True, metavar='nick,..', help='List of nicks allowed for IRC, if `pam` and optionally `pam_group` are set, PAM authentication will be used instead')

+ tornado.options.define('irc_password', default='', metavar='PASSWORD', help='Password for IRC authentication, if `pam` is set, PAM authentication will be used instead')

tornado.options.define('media_url', default=None, metavar='BASE_URL', help='Base URL for media files, should be configured in the external (to irgramd) webserver')

tornado.options.define('pam', default=False, help='Use PAM for IRC authentication, if not set you should set `irc_password`')

tornado.options.define('pam_group', default=None, metavar='GROUP', help='Unix group allowed if `pam` enabled, if empty any user is allowed')

- tornado.options.define('irc_nicks', type=str, multiple=True, metavar='nick,..', help='List of nicks allowed for IRC, if `pam` and optionally `pam_group` are set, PAM authentication will be used instead')

- tornado.options.define('irc_password', default='', metavar='PASSWORD', help='Password for IRC authentication, if `pam` is set, PAM authentication will be used instead')

+ tornado.options.define('port', default=None, metavar='PORT', help='Port to listen on. (default 6667, default with TLS 6697)')

+ tornado.options.define('tls', default=False, help='Use TLS/SSL encrypted connection for IRC server')

+ tornado.options.define('tls_cert', default=None, metavar='CERTFILE', help='IRC server certificate chain for TLS/SSL, also can contain private key if not defined with `tls_key`')

+ tornado.options.define('tls_key', default=None, metavar='KEYFILE', help='IRC server private key for TLS/SSL')

# parse cmd line first time to get --config and --config_dir

tornado.options.parse_command_line()

config_file = os.path.expanduser(tornado.options.options.config)