CE-DEV: some updates and tweaks (#95)

* Fix docker-compose v2 issue and re-release to include clamav role (#68)

* Killing old ce-dev container when updating (#70)

* Added Drupal9 and Localgov templates (#73)

* New release 1.1.19 (#75)

* Updated package.json version: 1.1.19 (#77)

* Updated package.json version: 1.1.19

* New tag to fix repo key for Chrome (#83)

* #CE-62820: Added support for composer '2.x' in Drupal 9 provision tem… (#89) (#91)

* #CE-62820: Added support for composer '2.x' in Drupal 9 provision template.

* #CE-62820: Attempt to fix pull request test cases by providing a default value for the 'new_user' in provision.

* #CE-62820: Attempt to fix pull request test cases by providing a default value for the 'key_name' in provision.

* #CE-62820: Attempt to fix pull request test cases by providing a default values for 'ce_deploy' in provision.

Co-authored-by: David Suissa <[email protected]>

Co-authored-by: David Suissa <[email protected]>

* REL 1.1.21: Using composer 2 with Drupal 9 by default (#92)

* Drupal template fixes pr 1.x (#94)

* Adding a Drupal 9 template to ce-dev.

* Testing nodejs version change with blank template.

* Incrementing version for release.

* There's no drupal9 template for ce-deploy.

* Renamed the settings and drush files for ce-dev

* Added nodejs 16.x as default version

* Added lhci_run role by default

* Some tweaks in the config

* Added the if statement to read info from an optional settings.local.php file

Co-authored-by: nfawbert <[email protected]>
Co-authored-by: davids4 <[email protected]>
Co-authored-by: David Suissa <[email protected]>
Co-authored-by: Greg Harvey <[email protected]>

Author: 5 people

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,17 +35,25 @@
         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.*
-        chdir: "{{ deploy_path }}"
+      community.general.composer:
+        command: require
+        arguments: drush/drush:11.*
+        working_dir: "{{ deploy_path }}"
   roles:
     - _init # Sets some variables the deploy scripts rely on.
     - composer # Composer install step.
@@ -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 %}

templates/drupal9/ce-dev/ansible/provision.yml.j2

@@ -48,14 +48,9 @@
         cli: true
     - lhci:
         enable_vnc: true
+    - nodejs:
+        version: 16.x
 {% endraw %}
-  pre_tasks:
-    # Debian has nodejs 12.x installed by default.
-    - name: Remove "node" package installed by default
-      ansible.builtin.apt:
-        name: nodejs
-        state: absent
-        purge: true
   tasks:
     - apt:
         update_cache: true

templates/drupal9/ce-dev/ansible/web/sites/default/local.drush.yml.j2

@@ -0,0 +1,4 @@
+# @see https://github.com/drush-ops/drush/blob/master/examples/example.drush.yml
+
+options:
+  uri: '{{ site.base_url }}'

templates/drupal9/ce-dev/ansible/web/sites/default/local.settings.php.j2

@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Include default settings.
+ */
+require __DIR__ . '/default.settings.php';
+
+/**
+ * Include default local dev settings.
+ */
+require DRUPAL_ROOT . '/sites/example.settings.local.php';
+
+$databases['default']['default'] = array (
+  'database' => '{{ build_databases[0].name }}',
+  'username' => '{{ build_databases[0].user }}',
+  'password' => '{{ build_databases[0].password }}',
+  'prefix' => '',
+  'host' => '{{ build_databases[0].host }}',
+  'port' => '3306',
+  'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
+  'driver' => 'mysql',
+);
+
+$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';
+}

templates/localgov/ce-dev/ansible/provision.yml.j2

@@ -45,13 +45,6 @@
     - lhci:
         enable_vnc: true
 {% endraw %}
-  pre_tasks:
-    # Debian has nodejs 12.x installed by default.
-    - name: Remove "node" package installed by default
-      ansible.builtin.apt:
-        name: nodejs
-        state: absent
-        purge: true
   tasks:
     - apt:
         update_cache: true