Skip to content

Commit

Permalink
BSD fixes #305: Forgot to to scaffold after updating deps. Also updat…
Browse files Browse the repository at this point in the history
…es deps again.
  • Loading branch information
mattsqd committed Oct 16, 2024
1 parent c1f75fd commit 43a5cf5
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 25 deletions.
25 changes: 15 additions & 10 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions composer.log
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ e854b19c73ce4a93589f51c9e10dfd5c|Matt Poole|feature/BSD-300-update-deps|Tue Sep
320ac2f509ac26933a05babde466b2a9|Matt Poole|feature/BSD-303-drupal-partner|Fri Oct 11 17:14:30 EDT 2024|./composer.sh require drupal/config_pages
c844a0df1fb652429755003179a5177c|Matt Poole|feature/BSD-305-dep-update|Tue Oct 15 15:56:33 EDT 2024|./composer.sh update
887db95451678c154f246321d8883647|Matt Poole|feature/BSD-305-dep-update|Tue Oct 15 16:03:26 EDT 2024|./composer.sh require drupal/autocomplete_deluxe
56ccb5a257914e0eced9c581db3dc19d|Matt Poole|release/1.5.0|Wed Oct 16 09:17:37 EDT 2024|./composer.sh update
4 changes: 2 additions & 2 deletions orch/deploy_install.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

set -e

./orch/show_file.sh $0

# Normally, XDEBUG_MODE=debug,develop but develop breaks the Drupal installation.
Expand All @@ -10,8 +12,6 @@ fi

drush cr

set -e

# If using Postgres, enable the pg_trgm extension which is required before
# Drupal is installed.
if [ -n "$(drush status | grep pgsql 2>/dev/null)" ]; then
Expand Down
26 changes: 13 additions & 13 deletions web/sites/default/settings.lando.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,33 +43,33 @@
throw new \Exception('The Database type "' . $lando_info->database->type . "' is not automatically able to be configured.");
}
}
/*

if (isset($lando_info->cache->type)) {
switch ($lando_info->cache->type) {
case 'redis':
if (!function_exists('_settings_redis')) {
require 'settings.redis.php';
require 'settings.redis.php';
if (function_exists('_settings_redis')) {
_settings_redis(
$settings,
$lando_info->cache->internal_connection->host,
$lando_info->cache->internal_connection->port
);
}
_settings_redis(
$settings,
$lando_info->cache->internal_connection->host,
$lando_info->cache->internal_connection->port
);
break;

case 'memcached':
if (!function_exists('_settings_memcache')) {
require 'settings.memcache.php';
require 'settings.memcache.php';
if (function_exists('_settings_memcache')) {
$memcache_host = implode(':', (array)$lando_info->cache->internal_connection);
_settings_memcache($settings, $memcache_host);
}
$memcache_host = implode(':', (array)$lando_info->cache->internal_connection);
_settings_memcache($settings, $memcache_host);
break;

default:
throw new \Exception('The Cache type "' . $lando_info->cache->type . "' is not automatically able to be configured.");

}
}*/
}

if (isset($lando_info->search->type)) {
switch ($lando_info->search->type) {
Expand Down

0 comments on commit 43a5cf5

Please sign in to comment.