From 42e3d36aa2bcc02508f53bea7ad7c7755f7e8ec9 Mon Sep 17 00:00:00 2001 From: Dionisio Date: Tue, 13 Sep 2022 13:18:38 +0200 Subject: [PATCH 1/5] Renamed the settings and drush files for ce-dev --- .../web/sites/default/{ce-dev.drush.yml.j2 => local.drush.yml.j2} | 0 .../default/{ce-dev.settings.php.j2 => local.settings.php.j2} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename templates/drupal9/ce-dev/ansible/web/sites/default/{ce-dev.drush.yml.j2 => local.drush.yml.j2} (100%) rename templates/drupal9/ce-dev/ansible/web/sites/default/{ce-dev.settings.php.j2 => local.settings.php.j2} (100%) diff --git a/templates/drupal9/ce-dev/ansible/web/sites/default/ce-dev.drush.yml.j2 b/templates/drupal9/ce-dev/ansible/web/sites/default/local.drush.yml.j2 similarity index 100% rename from templates/drupal9/ce-dev/ansible/web/sites/default/ce-dev.drush.yml.j2 rename to templates/drupal9/ce-dev/ansible/web/sites/default/local.drush.yml.j2 diff --git a/templates/drupal9/ce-dev/ansible/web/sites/default/ce-dev.settings.php.j2 b/templates/drupal9/ce-dev/ansible/web/sites/default/local.settings.php.j2 similarity index 100% rename from templates/drupal9/ce-dev/ansible/web/sites/default/ce-dev.settings.php.j2 rename to templates/drupal9/ce-dev/ansible/web/sites/default/local.settings.php.j2 From c7789aa88b73354676fea57825e84a1a5699a9c0 Mon Sep 17 00:00:00 2001 From: Dionisio Date: Tue, 13 Sep 2022 13:20:06 +0200 Subject: [PATCH 2/5] Added nodejs 16.x as default version --- templates/drupal9/ce-dev/ansible/provision.yml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/drupal9/ce-dev/ansible/provision.yml.j2 b/templates/drupal9/ce-dev/ansible/provision.yml.j2 index ec0363e..59439d1 100644 --- a/templates/drupal9/ce-dev/ansible/provision.yml.j2 +++ b/templates/drupal9/ce-dev/ansible/provision.yml.j2 @@ -48,6 +48,8 @@ cli: true - lhci: enable_vnc: true + - nodejs: + version: 16.x {% endraw %} tasks: - apt: From b960e565985f799bdbd251b92afb2d3fcdd5f371 Mon Sep 17 00:00:00 2001 From: Dionisio Date: Tue, 13 Sep 2022 13:20:44 +0200 Subject: [PATCH 3/5] Added lhci_run role by default --- templates/drupal9/ce-dev/ansible/deploy.yml.j2 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/templates/drupal9/ce-dev/ansible/deploy.yml.j2 b/templates/drupal9/ce-dev/ansible/deploy.yml.j2 index 0826731..a0cbc9e 100644 --- a/templates/drupal9/ce-dev/ansible/deploy.yml.j2 +++ b/templates/drupal9/ce-dev/ansible/deploy.yml.j2 @@ -14,7 +14,7 @@ # This actually does not take any backup, but is needed to populate settings.php. - mysql_backup: handling: none - credentials_handling: static + credentials_handling: manual # A list of Drupal sites (for multisites). - drupal: sites: @@ -35,16 +35,24 @@ no_dev: false working_dir: "{{ deploy_path }}" apcu_autoloader: false + - drush: + use_vendor: true + - drush_bin: "{{ deploy_path }}/vendor/drush/drush/drush" + - lhci_run: + # Create a list of URLs to test with LHCI + test_urls: + - "https://{{ _domain_name }}" pre_tasks: # You can safely remove these steps once you have a working composer.json. - name: Download composer file. - get_url: + ansible.builtin.get_url: url: https://raw.githubusercontent.com/drupal/recommended-project/9.3.x/composer.json dest: "{{ deploy_path }}/composer.json" force: false - name: Install drush. - command: - cmd: composer require drush/drush:11.* + community.general.composer: + command: require + arguments: drush/drush:11.* chdir: "{{ deploy_path }}" roles: - _init # Sets some variables the deploy scripts rely on. @@ -54,4 +62,5 @@ # - sync/database_sync # Grab database from a remote server. - database_apply # Run drush updb and config import. - _exit # Some common housekeeping. + - lhci_run {% endraw %} From 1bc17ba8d0a84506a3bf1be7f1028fead2da72c6 Mon Sep 17 00:00:00 2001 From: Dionisio Date: Tue, 13 Sep 2022 17:13:05 +0200 Subject: [PATCH 4/5] Some tweaks in the config --- templates/drupal9/ce-dev/ansible/deploy.yml.j2 | 2 +- .../ce-dev/ansible/web/sites/default/local.settings.php.j2 | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/templates/drupal9/ce-dev/ansible/deploy.yml.j2 b/templates/drupal9/ce-dev/ansible/deploy.yml.j2 index a0cbc9e..bf91f03 100644 --- a/templates/drupal9/ce-dev/ansible/deploy.yml.j2 +++ b/templates/drupal9/ce-dev/ansible/deploy.yml.j2 @@ -53,7 +53,7 @@ community.general.composer: command: require arguments: drush/drush:11.* - chdir: "{{ deploy_path }}" + working_dir: "{{ deploy_path }}" roles: - _init # Sets some variables the deploy scripts rely on. - composer # Composer install step. diff --git a/templates/drupal9/ce-dev/ansible/web/sites/default/local.settings.php.j2 b/templates/drupal9/ce-dev/ansible/web/sites/default/local.settings.php.j2 index d5eb492..a056c6d 100644 --- a/templates/drupal9/ce-dev/ansible/web/sites/default/local.settings.php.j2 +++ b/templates/drupal9/ce-dev/ansible/web/sites/default/local.settings.php.j2 @@ -7,7 +7,7 @@ require __DIR__ . '/default.settings.php'; /** * Include local dev settings. */ -require DRUPAL_ROOT . '/sites/example.settings.local.php' +require DRUPAL_ROOT . '/sites/example.settings.local.php'; $databases['default']['default'] = array ( 'database' => '{{ build_databases[0].name }}', @@ -22,8 +22,4 @@ $databases['default']['default'] = array ( $settings['file_private_path'] = '{{ build_private_file_path }}'; $settings['file_public_path'] = '{{ build_public_file_path }}'; - -// Drupal < 8.8 -$config_directories['sync'] = '{{ build_config_sync_directory }}'; -// Drupal 8.8 $settings['config_sync_directory'] = '{{ build_config_sync_directory }}'; From 665cca2a6d4a73091fa026e2d31a4b0dc19e75b2 Mon Sep 17 00:00:00 2001 From: Dionisio Date: Wed, 14 Sep 2022 11:51:37 +0200 Subject: [PATCH 5/5] Added the if statement to read info from an optional settings.local.php file --- .../ansible/web/sites/default/local.settings.php.j2 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/drupal9/ce-dev/ansible/web/sites/default/local.settings.php.j2 b/templates/drupal9/ce-dev/ansible/web/sites/default/local.settings.php.j2 index a056c6d..82c8a8f 100644 --- a/templates/drupal9/ce-dev/ansible/web/sites/default/local.settings.php.j2 +++ b/templates/drupal9/ce-dev/ansible/web/sites/default/local.settings.php.j2 @@ -4,8 +4,9 @@ * Include default settings. */ require __DIR__ . '/default.settings.php'; + /** - * Include local dev settings. + * Include default local dev settings. */ require DRUPAL_ROOT . '/sites/example.settings.local.php'; @@ -23,3 +24,10 @@ $databases['default']['default'] = array ( $settings['file_private_path'] = '{{ build_private_file_path }}'; $settings['file_public_path'] = '{{ build_public_file_path }}'; $settings['config_sync_directory'] = '{{ build_config_sync_directory }}'; + +/** + * Load local development override configuration, if available. + */ +if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { + include $app_root . '/' . $site_path . '/settings.local.php'; +}