oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-08-16 18:01:35 +00:00
Code Wiki Activity

Merge branch 'next' into 'next'

Browse source 
Allow TURN secret to be read from file

See merge request famedly/conduit!719
This commit is contained in:
charludo 2024-11-04 12:51:23 +00:00
commit 69116b16df
4 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/configuration.md
View file

@ -56,6 +56,7 @@ The `global` section contains the following fields:
| `turn_password` | `string` | The TURN password | `""` |
| `turn_uris` | `array` | The TURN URIs | `[]` |
| `turn_secret` | `string` | The TURN secret | `""` |
| `turn_secret_file` | `string` | Path to a file containing the TURN secret | `""` |
| `turn_ttl` | `integer` | The TURN TTL in seconds | `86400` |
| `emergency_password` | `string` | Set a password to login as the `conduit` user in case of emergency | N/A |
| `well_known` | `table` | Used for [delegation](delegation.md) | See [delegation](delegation.md) |
@ -94,7 +95,7 @@ An array of tables that contain the following fields:
Both `include` and `exclude` allow for glob pattern matching.
##### Example
In this example, all requests to domains ending in `.onion` and `matrix.secretly-an-onion-domain.xyz`
In this example, all requests to domains ending in `.onion` and `matrix.secretly-an-onion-domain.xyz`
will be proxied via `socks://localhost:9050`, except for domains ending in `.myspecial.onion`. You can add as many `by_domain` tables as you need.
```toml
[[global.proxy.by_domain]]

6
docs/turn.md
View file

@ -7,13 +7,17 @@
## Edit/Add a few settings to your existing conduit.toml
```
# Refer to your Coturn settings.
# Refer to your Coturn settings.
# `your.turn.url` has to match the REALM setting of your Coturn as well as `transport`.
turn_uris = ["turn:your.turn.url?transport=udp", "turn:your.turn.url?transport=tcp"]
# static-auth-secret of your turnserver
turn_secret = "ADD SECRET HERE"
# alternatively: read turn credentials from a file.
# turn_secret overrides turn_secret_file if both are set.
turn_secret_file = "/path/to/the/secret"
# If you have your TURN server configured to use a username and password
# you can provide these information too. In this case comment out `turn_secret above`!
#turn_username = ""