ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2025-05-14 06:22:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
cytopia 2022-01-23 13:32:39 +01:00 committed by GitHub
commit 68bd88d304
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.devilbox/www/config.php
View File

@ -127,15 +127,27 @@ function loadClass($class) {
break; break;
case 'Redis': case 'Redis':
// Check if redis is using a password // Check if redis is using a password
$REDIS_ROOT_PASSWORD = ''; $REDIS_ROOT_PASSWORD = '';
$_REDIS_ARGS = loadClass('Helper')->getEnv('REDIS_ARGS'); $_REDIS_ARGS = loadClass('Helper')->getEnv('REDIS_ARGS');
$_REDIS_PASS = preg_split("/--requirepass\s+/", $_REDIS_ARGS);
if (is_array($_REDIS_PASS) && count($_REDIS_PASS)) { /*
// In case the option is specified multiple times, use the last effective one. * This pattern will match optional quoted string, 'my password' or "my password"
$_REDIS_PASS = $_REDIS_PASS[count($_REDIS_PASS)-1]; * or if there aren't any quotes, it will match up until the next space.
*/
$_REDIS_PASS = [];
preg_match_all('/--requirepass\s+("|\')?(?(1)(.*)|([^\s]*))(?(1)\1|)/', $_REDIS_ARGS, $_REDIS_PASS, PREG_SET_ORDER);
if (! empty($_REDIS_PASS)) {
/*
* In case the option is specified multiple times, use the last effective one.
*
* preg_match_all returns a multi-dimensional array, the first level array is in order of which was matched first,
* and the password string is either matched in group 2 or group 3 which is always the end of the sub-array.
*/
$_REDIS_PASS = end(end($_REDIS_PASS));
if (strlen($_REDIS_PASS) > 0) { if (strlen($_REDIS_PASS) > 0) {
$REDIS_ROOT_PASSWORD = $_REDIS_PASS; $REDIS_ROOT_PASSWORD = $_REDIS_PASS;
} }

4
docs/getting-started/change-container-versions.rst
View File

@ -128,7 +128,7 @@ Now save the file and you can start the Devilbox again.
# Navigate to the Devilbox directory # Navigate to the Devilbox directory
host> cd path/to/devilbox host> cd path/to/devilbox
# Stop all container # Start all container
host> docker-compose up php httpd bind host> docker-compose up php httpd bind
.. seealso:: :ref:`start_the_devilbox` .. seealso:: :ref:`start_the_devilbox`
@ -193,7 +193,7 @@ Now save the file and you can start the Devilbox again.
# Navigate to the Devilbox directory # Navigate to the Devilbox directory
host> cd path/to/devilbox host> cd path/to/devilbox
# Stop all container # Start all container
host> docker-compose up php httpd bind host> docker-compose up php httpd bind
.. seealso:: :ref:`start_the_devilbox` .. seealso:: :ref:`start_the_devilbox`