-
Notifications
You must be signed in to change notification settings - Fork 983
Provides initial TLS support to aio-talk #7605
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
rseabra
wants to merge
2
commits into
nextcloud:main
Choose a base branch
from
rseabra:tls2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+74
−6
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # Nextcloud All-In-One Talk Container | ||
|
|
||
| ## Variables | ||
|
|
||
| | Name | Description | Required | Default | | ||
| | ---- | ----------- | -------- | ------- | | ||
| | `NC_DOMAIN` | Your Nextcloud domain | *true* | n/a | | ||
| | `TALK_HOST` | Your talk host domain | *true* | n/a | | ||
| | `TALK_PORT` | Your talk host's STUN port | *false* | 3478 | | ||
| | `TALK_TLS_PORT` | Your talk host's STUNS port. It won't be activated if you don't provide a certificate and key with the following two variables. | *false* | 5349 | | ||
| | `TALK_TLS_CRT` | Your talk host's STUNS certificate file path (map it as a volume) | *true* if you want TLS activated | n/a | | ||
| | `TALK_TLS_KEY` | Your talk host's STUNS certificate key file path (map it as a volume) | *true* if you want TLS activated | n/a | | ||
| | `TALK_HTTP_PORT` | Your talk host's HTTP port | *false* | 8081 | | ||
| | `TALK_HTTP_READ_TIMEOUT` | HTTP server's read timeout. | *false* | 15 | | ||
| | `TALK_HTTP_WRITE_TIMEOUT` | HTTP server's write timeout. | *false* | 30 | | ||
| | `TALK_HTTPS_PORT` | Your talk host's HTTPS port. It won't be activated if you don't provide a certificate and key with the following two variables. | *false* | 8443 | | ||
| | `TALK_HTTPS_CRT` | Your talk host's HTTPS certificate file path (map it as a volume) | *true* if you want HTTPS activated | n/a | | ||
| | `TALK_HTTPS_KEY` | Your talk host's HTTPS certificate key file path (map it as a volume) | *true* if you want HTTPS activated | n/a | | ||
| | `TALK_HTTPS_READ_TIMEOUT` | HTTPS server's read timeout. | *false* | 15 | | ||
| | `TALK_HTTPS_WRITE_TIMEOUT` | HTTPS server's write timeout. | *false* | 30 | | ||
| | `TURN_SECRET` | The turn server secret | *true* | n/a | | ||
| | `SIGNALING_SECRET` | The signaling server secret, that you'll also need to paste in Nextcloud's High Performance Backend configuration | *true* | n/a | | ||
| | `INTERNAL_SECRET` | The internal secret | *true* | n/a | | ||
| | `TALK_RELAY_MIN_PORT` | The minimum udp port range | *false* | 49152 | | ||
| | `TALK_RELAY_MAX_PORT` | The maximum udp port range | *false* | 65535 | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a breaking change in behaviour, which we would like to avoid.
Please revert
$TALK_PORTto being a required variable without a default.$TALK_TLS_PORTshould not be required (as that would be a breaking change, too), but it should not have a default value, neither. Instead it shouldn't be activated if unset.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not a breaking change, it merely makes it unnecessary to specify the default port.
As you can see, the standard port is the same accepted argument and inside the start.sh script a more clear variable name called STUN_PORT is used.
It is set to either TALK_PORT as provided, or the default port, and then it's STUN_PORT that's actually used.
This doesn't break anything, it just makes it more comfortable to use: you only need the parameter if you're not using the default port.