From 92c48da4a364c0861300d65152e9cf7c217d4b73 Mon Sep 17 00:00:00 2001 From: Vincenzo De Naro Papa Date: Mon, 23 Sep 2019 15:46:08 +0200 Subject: [PATCH] Replace REDIS_PORT to REDIS_SERVICE_PORT --- .../drupal8-composer-mariadb/web/sites/default/settings.php | 2 +- .../drupal8-composer-postgres/web/sites/default/settings.php | 2 +- docs/using_lagoon/drupal/services/redis.md | 2 +- tests/files/drupal8-mariadb/web/sites/default/settings.php | 2 +- tests/files/drupal8-postgres/web/sites/default/settings.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/using_lagoon/drupal/drupal8-composer-mariadb/web/sites/default/settings.php b/docs/using_lagoon/drupal/drupal8-composer-mariadb/web/sites/default/settings.php index 2e193a97e5..0e675202f6 100755 --- a/docs/using_lagoon/drupal/drupal8-composer-mariadb/web/sites/default/settings.php +++ b/docs/using_lagoon/drupal/drupal8-composer-mariadb/web/sites/default/settings.php @@ -56,7 +56,7 @@ if (getenv('LAGOON') && (file_exists($app_root . '/modules/contrib/redis') || file_exists($app_root . 'modules/redis')) && extension_loaded('redis')) { $settings['redis.connection']['interface'] = 'PhpRedis'; $settings['redis.connection']['host'] = getenv('REDIS_HOST') ?: 'redis'; - $settings['redis.connection']['port'] = 6379; + $settings['redis.connection']['port'] = getenv('REDIS_SERVICE_PORT') ?: '6379'; $settings['cache_prefix']['default'] = getenv('LAGOON_PROJECT') . '_' . getenv('LAGOON_GIT_SAFE_BRANCH'); diff --git a/docs/using_lagoon/drupal/drupal8-composer-postgres/web/sites/default/settings.php b/docs/using_lagoon/drupal/drupal8-composer-postgres/web/sites/default/settings.php index 94b0c59d84..59363c8c55 100755 --- a/docs/using_lagoon/drupal/drupal8-composer-postgres/web/sites/default/settings.php +++ b/docs/using_lagoon/drupal/drupal8-composer-postgres/web/sites/default/settings.php @@ -55,7 +55,7 @@ // if (getenv('LAGOON')){ // $settings['redis.connection']['interface'] = 'PhpRedis'; // $settings['redis.connection']['host'] = getenv('REDIS_HOST') ?: 'redis'; -// $settings['redis.connection']['port'] = 6379; +// $settings['redis.connection']['port'] = getenv('REDIS_SERVICE_PORT') ?: '6379'; // // // HINT: Uncomment in order to enable Redis // // # Do not set the cache during installations of Drupal diff --git a/docs/using_lagoon/drupal/services/redis.md b/docs/using_lagoon/drupal/services/redis.md index 5d275802d1..099a54500e 100644 --- a/docs/using_lagoon/drupal/services/redis.md +++ b/docs/using_lagoon/drupal/services/redis.md @@ -40,7 +40,7 @@ The Drupal 8 config is largely stock. Notably, redis is disabled while drupal is if (getenv('LAGOON')){ $settings['redis.connection']['interface'] = 'PhpRedis'; $settings['redis.connection']['host'] = getenv('REDIS_HOST') ?: 'redis'; - $settings['redis.connection']['port'] = 6379; + $settings['redis.connection']['port'] = getenv('REDIS_SERVICE_PORT') ?: '6379'; $settings['cache_prefix']['default'] = getenv('LAGOON_PROJECT') . '_' . getenv('LAGOON_GIT_SAFE_BRANCH'); // Do not set the cache during installations of Drupal diff --git a/tests/files/drupal8-mariadb/web/sites/default/settings.php b/tests/files/drupal8-mariadb/web/sites/default/settings.php index efddd70cb4..856350e2f6 100755 --- a/tests/files/drupal8-mariadb/web/sites/default/settings.php +++ b/tests/files/drupal8-mariadb/web/sites/default/settings.php @@ -57,7 +57,7 @@ if (getenv('LAGOON')){ $settings['redis.connection']['interface'] = 'PhpRedis'; $settings['redis.connection']['host'] = getenv('REDIS_HOST') ?: 'redis'; - $settings['redis.connection']['port'] = getenv('REDIS_PORT') ?: '6379'; + $settings['redis.connection']['port'] = getenv('REDIS_SERVICE_PORT') ?: '6379'; // # Do not set the cache during installations of Drupal // if (!drupal_installation_attempted()) { diff --git a/tests/files/drupal8-postgres/web/sites/default/settings.php b/tests/files/drupal8-postgres/web/sites/default/settings.php index a11920d953..4cbf616784 100755 --- a/tests/files/drupal8-postgres/web/sites/default/settings.php +++ b/tests/files/drupal8-postgres/web/sites/default/settings.php @@ -57,7 +57,7 @@ if (getenv('LAGOON')){ $settings['redis.connection']['interface'] = 'PhpRedis'; $settings['redis.connection']['host'] = getenv('REDIS_HOST') ?: 'redis'; - $settings['redis.connection']['port'] = getenv('REDIS_PORT') ?: '6379'; + $settings['redis.connection']['port'] = getenv('REDIS_SERVICE_PORT') ?: '6379'; // # Do not set the cache during installations of Drupal // if (!drupal_installation_attempted()) {