Skip to content

Commit

Permalink
Devops-XXX - Ddev config update (#61)
Browse files Browse the repository at this point in the history
  • Loading branch information
mdyoung3 authored Jan 10, 2024
1 parent a294815 commit b38bede
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
13 changes: 8 additions & 5 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
name: sul
type: drupal9
type: drupal10
docroot: docroot
php_version: "8.1"
php_version: "8.2"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
xdebug_enabled: false
additional_hostnames: []
additional_hostnames:
- library
additional_fqdns: []
database:
type: mariadb
Expand All @@ -15,8 +16,10 @@ nfs_mount_enabled: false
mutagen_enabled: false
hooks:
post-import-db:
- exec: drush cim -y
- exec: drush cr
- exec: drush --uri=https://library.ddev.site cim -y
- exec: drush --uri=https://library.ddev.site cr
- exec: drush --uri=https://library.ddev.site uli

use_dns_when_possible: true
composer_version: "2"
web_environment: []
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,5 @@ drush/sites/.checksums
# Deprecation detector rules
.rules

#ignore ddev settings
docroot/sites/**/settings/settings.ddev.php
1 change: 1 addition & 0 deletions blt/deploy-exclude-additions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ simplesamlphp/config/local.authsources.php
lando
vendor/simplesamlphp/simplesamlphp/config/local.config.php
vendor/simplesamlphp/simplesamlphp/config/local.authsources.php
.ddev
9 changes: 9 additions & 0 deletions docroot/sites/library/settings/default.local.settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,12 @@
$settings['trusted_host_patterns'] = [
'^.+$',
];

// Include additional settings files for local development
$additionalSettingsFiles = [__DIR__ . '/settings.ddev.php'];

foreach ($additionalSettingsFiles as $additionalSettingsFile) {
if (file_exists($additionalSettingsFile)) {
require $additionalSettingsFile;
}
}

0 comments on commit b38bede

Please sign in to comment.