Add PSM_BASE_URL as possible environment variable #13
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
for PSM instances running behind a reverse proxy with https the PSM_BASE_URL configuration in the config.php is required to prevent browsers from warning about insecure forms when editing/adding servers or users. see phpservermon/phpservermon#1140 This commit will add the line define('PSM_BASE_URL', 'https://[...]'); to the config-php on container startup if the PSM_BASE_URL environment Variable is set/passed.
for some reason when i pulled the repo and built the container, the maria-wait.sh file did not have the execute bit set and the container failed to start. excplicitly setting the execute bit in the dockerfile fixes this problem
casperklein
reviewed
Aug 7, 2021
| @@ -20,6 +20,10 @@ define('PSM_DB_PREFIX', '${MYSQL_DATABASE_PREFIX}'); | |||
| ?> | |||
| EOF | |||
|
|
|||
| if [ ${PSM_BASE_URL} != false ]; then | |||
| sed -i "s|?>|define('PSM_BASE_URL', '$PSM_BASE_URL');\n?>|1" ${APACHE_DOCUMENT_ROOT}/config.php | |||
There was a problem hiding this comment.
What is the 1 for? I've never seen that before.
There was a problem hiding this comment.
it means replace first ocurrence only
it was in the sed command I copied from so I just left it.
g would also work obviously
jdecool
approved these changes
Aug 12, 2021
|
Can this be merged in, please? :) |
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.
I encountered the problem described here: phpservermon/phpservermon#1140
and the solution is to add a PSM_BASE_URL setting to the config.php.
Because the config.php is automatically created on each container start, i decided to make it configurable via an environment variable.
If the variable is not set, the config.php is not changed.
If the variable is set the line
define('PSM_BASE_URL', '<content of the env-variable>');will be added to the config.php on container start.