From 9561b4807a74774432db2e15ea9aff13ab81ae31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 19 Sep 2023 21:28:52 +0200 Subject: [PATCH] Update config.yaml according to upstream. --- conf/config.yaml | 86 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 73 insertions(+), 13 deletions(-) diff --git a/conf/config.yaml b/conf/config.yaml index c8a4dcd..2586b71 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -1,4 +1,4 @@ -# GENERATED BY YUNOHOST FROM UPSTREAM VERSION 0.32.1 +# GENERATED BY YUNOHOST FROM UPSTREAM VERSION 1.0.1 # Configuration specific to AS registration. Unless other marked, all fields # are *REQUIRED*. @@ -38,7 +38,7 @@ homeserver: # Which port should the appservice bind to. Can be overriden by the one provided in the # command line! Optional. - # bindPort: 9999 + # bindPort: 8090 # Use this option to force the appservice to listen on another hostname for transactions. # This is NOT your synapse hostname. E.g. use 127.0.0.1 to only listen locally. Optional. @@ -334,8 +334,8 @@ ircService: # The display name to use for created matrix clients. This should have # $NICK somewhere in it if it is specified. Can also use $SERVER to # insert the IRC domain. - # Optional. Default: "$NICK (IRC)". Example: "Alice (IRC)" - displayName: "$NICK (IRC)" + # Optional. Default: "$NICK". Example: "Alice" + displayName: "$NICK" # Number of tries a client can attempt to join a room before the request # is discarded. You can also use -1 to never retry or 0 to never give up. # Optional. Default: -1 @@ -373,6 +373,16 @@ ircService: # Older kernels will need IP_FREEBIND, which requires an LD_PRELOAD with the library # https://github.com/matrix-org/freebindfree as Node does not expose setsockopt. # prefix: "2001:0db8:85a3::" # modify appropriately + + # Optional. Define blocks of IPv6 addresses for different homeservers + # which can be used to restrict users of those homeservers to a given + # IP. These blocks should be considered immutable once set, as changing + # the startFrom value will NOT adjust existing IP addresses. + # Changing the startFrom value to a lower value may conflict with existing clients. + # Multiple homeservers may NOT share blocks. + blocks: + - homeserver: another-server.org + startFrom: '10:0000' # # The maximum amount of time in seconds that the client can exist # without sending another message before being disconnected. Use 0 to @@ -461,7 +471,6 @@ ircService: # Configuration for logging. Optional. Default: console debug level logging # only. - # This key CANNOT be hot-reloaded logging: # Level to log on console/logfile. One of error|warn|info|debug level: "warn" @@ -480,7 +489,7 @@ ircService: # This key CANNOT be hot-reloaded metrics: # Whether to actually enable the metric endpoint. Default: false - enabled: true + enabled: false # Which port to listen on (omit to listen on the bindPort) port: 7001 # Which hostname to listen on (omit to listen on 127.0.0.1), requires port to be set @@ -512,15 +521,15 @@ ircService: port: 11100 # Configuration for the provisioning API. - # - # GET /_matrix/provision/link - # GET /_matrix/provision/unlink - # GET /_matrix/provision/listlinks - # # This key CANNOT be hot-reloaded provisioning: # True to enable the provisioning HTTP endpoint. Default: false. enabled: false + # Whether to enable hosting the setup widget page. Default: false. + widget: true + # A secure secret token for making provisioner requests. Default: the appservice hs_token. + secret: $generateMe + # The number of seconds to wait before giving up on getting a response from # an IRC channel operator. If the channel operator does not respond within the # allotted time period, the provisioning request will fail. @@ -540,11 +549,46 @@ ircService: # These users will deny a room from being bridged. - "@.*:badguys.com" - # Watch the file for changes, and apply the rules. Default: false - enableReload: true # Number of channels allowed to be bridged roomLimit: 50 + # Endpoint prefix for provisoning requests. Default: "/_matrix/provision" + # apiPrefix: "/_matrix/provision" + # Whether to apply rate limiting to the provisioning API. Default: true. + # ratelimit: true + + # Run a separate HTTP listener for provisioning requests. + http: + # The port to listen on. + port: 7700 + # The host to listen on. Optional. By default this is 0.0.0.0 + # host: 0.0.0.0 + + # When users request a token from the bridge to make provisioning + # requests, disallow any requests that resolve a Matrix server_name included in these ranges. + # This list should include any internal IPs that the bridge should never lookup. + # By default, the below list is used. + # openIdDisallowedIpRanges: + # - '127.0.0.0/8' + # - '10.0.0.0/8' + # - '172.16.0.0/12' + # - '192.168.0.0/16' + # - '100.64.0.0/10' + # - '192.0.0.0/24' + # - '169.254.0.0/16' + # - '192.88.99.0/24' + # - '198.18.0.0/15' + # - '192.0.2.0/24' + # - '198.51.100.0/24' + # - '203.0.113.0/24' + # - '224.0.0.0/4' + # - '::1/128' + # - 'fe80::/10' + # - 'fc00::/7' + # - '2001:db8::/32' + # - 'ff00::/8' + # - 'fec0::/10' + # WARNING: The bridge needs to send plaintext passwords to the IRC server, it cannot # send a password hash. As a result, passwords (NOT hashes) are stored encrypted in # the database. @@ -575,6 +619,7 @@ ircService: # Maximum number of montly active users, beyond which the bridge gets blocked (both ways) # RMAUlimit: 100 + # Optional. # userActivity: # The "grace period" before we start counting users as active # minUserActiveDays: 1 @@ -623,6 +668,13 @@ ircService: # the configuration in the config file. # allowUnconnectedMatrixUsers: true + # Options for hooking into Matrix moderation policy lists + banLists: + # A list of rooms containing "m.policy.rule.*" events which can be used + # to identify banned users, rooms and servers. + rooms: + - "#matrix-org-coc-bl:matrix.org" + # Options here are generally only applicable to large-scale bridges and may have # consequences greater than other options in this configuration file. advanced: @@ -655,3 +707,11 @@ database: # For postgres, it must start with postgres:// # For NeDB, it must start with nedb://. The path is relative to the project directory. connectionString: "postgres://__DB_NAME__:__DB_PWD__@localhost:5432/__DB_NAME__" + +# Enable running IRC connections out of a secondary process. +# See https://matrix-org.github.io/matrix-appservice-irc/latest/connection_pooling.html for more information +# connectionPool: +# # The Redis URI to connect to +# redisUrl: redis://user:password@host:port/dbnum +# # Should the connections persist after the bridge successfully shuts down? +# persistConnectionsOnShutdown: true