making NEXTCLOUD_TRUSTED_DOMAINS after installation #2084
Conversation
This file contains 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
added 2 commits
October 13, 2023 16:37
Signed-off-by: Melvin mngmt-02 <[email protected]> Signed-off-by: Melvin Suter <[email protected]>
Signed-off-by: Melvin mngmt-02 <[email protected]> Signed-off-by: Melvin Suter <[email protected]>
|
Hi,
|
Signed-off-by: Melvin Suter <[email protected]>
Changed it. Thanks. |
kesselb
reviewed
Oct 16, 2023
|
|
||
| if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) { | ||
| // Get originaly configured values | ||
| include(__DIR__.'/config.php'); |
There was a problem hiding this comment.
That's evil, don't do that.
There was a problem hiding this comment.
The $CONFIG is overwritten so that shouldn't be an issue. But if anyone does interesting things in config.php it could break things, you are right. I did this to make it backwards compatible, so people can still use their values manually configured in config.php (or with occ). Any ideas how to make this happen?
There was a problem hiding this comment.
Sorry, no ideas. But it still looks like a bad idea to include the actual configuration here again.
utshomax
reviewed
Nov 15, 2023
|
|
||
| // Add environment variables | ||
| $CONFIG = array( | ||
| 'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) |
There was a problem hiding this comment.
@melvin-suter I think the 'NEXTCLOUD_TRUSTED_DOMAINS' is separated as mentioned in the docker doc.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
ALL configurations should be made with environment variables instead of manually editing configurations.
The ENV variable is already there but ignored after installation. This change will allow trusted domains to be configured over ENV variables, while still considering the configured values inside config.php.