Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Devops-XXX - Ddev config update #61

Merged
merged 7 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
mdyoung3 marked this conversation as resolved.
Show resolved Hide resolved
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
7 changes: 7 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,10 @@
$settings['trusted_host_patterns'] = [
'^.+$',
];

// Automatically generated include for settings managed by ddev.
$ddev_settings = dirname(__FILE__) . '/settings.ddev.php';
if (getenv('IS_DDEV_PROJECT') == 'true' && is_readable($ddev_settings)) {
mdyoung3 marked this conversation as resolved.
Show resolved Hide resolved
require $ddev_settings;
}

Loading