Issue #2050: Update Drupal role to latest version.

provisioning/requirements.yml

@@ -19,7 +19,7 @@ roles:
   - name: geerlingguy.daemonize
     version: 1.2.1
   - name: geerlingguy.drupal
-    version: 3.0.1
+    version: 4.0.0
   - name: geerlingguy.drupal-console
     version: 1.1.1
   - name: geerlingguy.drush

provisioning/roles/geerlingguy.drupal/.github/stale.yml

@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.

provisioning/roles/geerlingguy.drupal/.travis.yml

@@ -6,15 +6,16 @@ env:
   global:
     - ROLE_NAME: drupal
   matrix:
-    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: debian9
-    - MOLECULE_DISTRO: centos7
+    # See: https://github.com/geerlingguy/ansible-role-drupal/issues/77
+    # - MOLECULE_DISTRO: debian10
+    - MOLECULE_DISTRO: centos8
       MOLECULE_PLAYBOOK: playbook-deploy.yml
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.

provisioning/roles/geerlingguy.drupal/README.md

@@ -67,7 +67,7 @@ If you set the `bin-dir` in your project's `composer.json` file to a value other
 ### Create a new project using `composer create-project` (Composer)
 
     drupal_build_composer_project: true
-    drupal_composer_project_package: "drupal/recommended-project:^8@dev"
+    drupal_composer_project_package: "drupal/recommended-project:^9@dev"
     drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
 
 Set this to `true` and `drupal_build_makefile`, `drupal_build_composer` to `false` if you are using Composer's `create-project` as a site deployment strategy.

provisioning/roles/geerlingguy.drupal/defaults/main.yml

@@ -31,7 +31,7 @@ drupal_composer_dependencies:
 # 'false' if you are using Composer's create-project as a site deployment
 # strategy.
 drupal_build_composer_project: true
-drupal_composer_project_package: "drupal/recommended-project:^8@dev"
+drupal_composer_project_package: "drupal/recommended-project:^9@dev"
 drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
 
 # Required Drupal settings.

provisioning/roles/geerlingguy.drupal/meta/main.yml

@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: drupal
   author: geerlingguy
   description: Deploy or install Drupal on your servers.
   company: "Midwestern Mac, LLC"

provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml → provisioning/roles/geerlingguy.drupal/molecule/default/converge.yml

@@ -14,7 +14,7 @@
 
   roles:
     - name: geerlingguy.repo-remi
-      when: ansible_os_family == "RedHat"
+      when: ansible_os_family == 'RedHat'
     - role: geerlingguy.repo-dotdeb
       when: ansible_distribution == 'Debian'
     - role: geerlingguy.apache

provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml

@@ -3,10 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +17,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}

provisioning/roles/geerlingguy.drupal/molecule/default/playbook-deploy.yml

@@ -28,6 +28,7 @@
       when: ansible_distribution == 'Debian'
     - role: geerlingguy.apache
     - role: geerlingguy.mysql
+    - role: geerlingguy.php-versions
     - role: geerlingguy.php
     - role: geerlingguy.php-mysql
     - role: geerlingguy.git

provisioning/roles/geerlingguy.drupal/molecule/default/test-setup.yml

@@ -1,11 +1,11 @@
 ---
 - name: Update apt cache.
-  apt: update_cache=yes cache_valid_time=86400
+  apt: update_cache=yes cache_valid_time=600
   when: ansible_os_family == 'Debian'
 
 - name: Install dependencies.
-  package: name={{ item }}
-  with_items:
-    - curl
-    - unzip
-    - sendmail
+  package:
+    name:
+      - curl
+      - unzip
+      - sendmail

provisioning/roles/geerlingguy.drupal/molecule/default/test-vars.yml

@@ -21,6 +21,7 @@ apache_vhosts:
             SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
           </FilesMatch>
 
+mysql_python_package_debian: python3-mysqldb
 mysql_enablerepo: "remi"
 mysql_databases:
   - name: "{{ drupal_db_name }}"