Merge pull request #2014 from geerlingguy/updated-requirements

Update roles - blackfire, daemonize, elasticsearch, mysql, nodejs, ph…

.travis.yml

@@ -20,17 +20,20 @@ env:
     # Defaults - Ubuntu 18.04.
     - type: defaults
       distro: ubuntu1804
+      tag: python2
     # Defaults - Debian 9.
     - type: debian
       distro: debian9
     # Defaults - CentOS 7.
     - type: centos
       distro: centos7
+      tag: python2
       local_config: tests/centos-7.config.yml
 
     # PHP 7.3 - Ubuntu 18.04.
     - type: defaults
       distro: ubuntu1804
+      tag: python2
       local_config: tests/ubuntu-18-php73.config.yml
       DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
       TEST_INSTALLED_EXTRAS: false
@@ -51,9 +54,6 @@ env:
     #   TEST_INSTALLED_EXTRAS: false
 
 before_install:
-  # Pull container.
-  - docker pull geerlingguy/docker-${distro}-ansible:latest
-
   # Install lint tools.
   - gem install rubocop
 

provisioning/docker/bake.sh

@@ -15,6 +15,7 @@ DRUPALVM_HTTP_PORT="${DRUPALVM_HTTP_PORT:-80}"
 DRUPALVM_HTTPS_PORT="${DRUPALVM_HTTPS_PORT:-443}"
 
 DISTRO="${DISTRO:-ubuntu1804}"
+TAG="${TAG:-python2}"
 OPTS="${OPTS:---privileged}"
 INIT="${INIT:-/lib/systemd/systemd}"
 
@@ -41,7 +42,7 @@ docker run --name=$DRUPALVM_MACHINE_NAME -d \
   -p $DRUPALVM_IP_ADDRESS:$DRUPALVM_HTTP_PORT:80 \
   -p $DRUPALVM_IP_ADDRESS:$DRUPALVM_HTTPS_PORT:443 \
   $OPTS \
-  geerlingguy/docker-$DISTRO-ansible:latest \
+  geerlingguy/docker-$DISTRO-ansible:$TAG \
   $INIT
 
 # Create Drupal directory.

provisioning/requirements.yml

@@ -1,81 +1,82 @@
 ---
-- src: arknoll.selenium
-  version: 2.2.2
-- src: thom8.php-upload-progress
-  version: 1.0.1
-- src: weareinteractive.newrelic
-  version: 1.8.0
-- src: geerlingguy.adminer
-  version: 1.2.0
-- src: geerlingguy.apache
-  version: 3.1.0
-- src: geerlingguy.apache-php-fpm
-  version: 1.1.0
-- src: geerlingguy.blackfire
-  version: 1.1.2
-- src: geerlingguy.composer
-  version: 1.7.6
-- src: geerlingguy.daemonize
-  version: 1.2.0
-- src: geerlingguy.drupal
-  version: 3.0.1
-- src: geerlingguy.drupal-console
-  version: 1.1.1
-- src: geerlingguy.drush
-  version: 3.1.2
-- src: geerlingguy.elasticsearch
-  version: 4.1.0
-- src: geerlingguy.firewall
-  version: 2.4.3
-- src: geerlingguy.git
-  version: 2.1.0
-- src: geerlingguy.java
-  version: 1.9.7
-- src: geerlingguy.mailhog
-  version: 2.2.0
-- src: geerlingguy.memcached
-  version: 1.0.8
-- src: geerlingguy.mysql
-  version: 2.9.5
-- src: geerlingguy.nginx
-  version: 2.7.0
-- src: geerlingguy.nodejs
-  version: 5.1.0
-- src: geerlingguy.php
-  version: 3.7.0
-- src: geerlingguy.php-memcached
-  version: 2.0.2
-- src: geerlingguy.php-mysql
-  version: 2.0.2
-- src: geerlingguy.php-pecl
-  version: 1.4.1
-- src: geerlingguy.php-pgsql
-  version: 1.0.1
-- src: geerlingguy.php-redis
-  version: 3.2.1
-- src: geerlingguy.php-tideways
-  version: 2.2.0
-- src: geerlingguy.php-versions
-  version: 4.0.2
-- src: geerlingguy.php-xdebug
-  version: 3.0.0
-- src: geerlingguy.php-xhprof
-  version: 3.0.0
-- src: geerlingguy.pimpmylog
-  version: 1.0.2
-- src: geerlingguy.postfix
-  version: 2.0.0
-- src: geerlingguy.postgresql
-  version: 2.0.1
-- src: geerlingguy.redis
-  version: 1.6.0
-- src: geerlingguy.repo-remi
-  version: 1.2.0
-- src: geerlingguy.ruby
-  version: 2.5.2
-- src: geerlingguy.security
-  version: 1.9.0
-- src: geerlingguy.solr
-  version: 5.0.0
-- src: geerlingguy.varnish
-  version: 3.0.2
+roles:
+  - name: arknoll.selenium
+    version: 2.2.2
+  - name: thom8.php-upload-progress
+    version: 1.0.1
+  - name: weareinteractive.newrelic
+    version: 1.8.0
+  - name: geerlingguy.adminer
+    version: 1.2.0
+  - name: geerlingguy.apache
+    version: 3.1.0
+  - name: geerlingguy.apache-php-fpm
+    version: 1.1.0
+  - name: geerlingguy.blackfire
+    version: 1.1.3
+  - name: geerlingguy.composer
+    version: 1.7.6
+  - name: geerlingguy.daemonize
+    version: 1.2.1
+  - name: geerlingguy.drupal
+    version: 3.0.1
+  - name: geerlingguy.drupal-console
+    version: 1.1.1
+  - name: geerlingguy.drush
+    version: 3.1.2
+  - name: geerlingguy.elasticsearch
+    version: 4.1.1
+  - name: geerlingguy.firewall
+    version: 2.4.3
+  - name: geerlingguy.git
+    version: 2.1.0
+  - name: geerlingguy.java
+    version: 1.9.7
+  - name: geerlingguy.mailhog
+    version: 2.2.0
+  - name: geerlingguy.memcached
+    version: 1.0.8
+  - name: geerlingguy.mysql
+    version: 3.0.0
+  - name: geerlingguy.nginx
+    version: 2.7.0
+  - name: geerlingguy.nodejs
+    version: 5.1.1
+  - name: geerlingguy.php
+    version: 3.7.0
+  - name: geerlingguy.php-memcached
+    version: 2.0.2
+  - name: geerlingguy.php-mysql
+    version: 2.0.2
+  - name: geerlingguy.php-pecl
+    version: 1.4.2
+  - name: geerlingguy.php-pgsql
+    version: 1.0.1
+  - name: geerlingguy.php-redis
+    version: 3.2.1
+  - name: geerlingguy.php-tideways
+    version: 2.2.0
+  - name: geerlingguy.php-versions
+    version: 4.0.3
+  - name: geerlingguy.php-xdebug
+    version: 3.0.0
+  - name: geerlingguy.php-xhprof
+    version: 3.0.0
+  - name: geerlingguy.pimpmylog
+    version: 1.0.2
+  - name: geerlingguy.postfix
+    version: 2.0.0
+  - name: geerlingguy.postgresql
+    version: 2.0.2
+  - name: geerlingguy.redis
+    version: 1.6.0
+  - name: geerlingguy.repo-remi
+    version: 1.2.0
+  - name: geerlingguy.ruby
+    version: 2.6.0
+  - name: geerlingguy.security
+    version: 1.9.0
+  - name: geerlingguy.solr
+    version: 5.0.0
+  - name: geerlingguy.varnish
+    version: 3.0.3

provisioning/roles/geerlingguy.blackfire/.ansible-lint

@@ -0,0 +1,2 @@
+skip_list:
+  - '503'

provisioning/roles/geerlingguy.blackfire/.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy

provisioning/roles/geerlingguy.blackfire/.travis.yml

@@ -12,7 +12,7 @@ env:
 
 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.blackfire/molecule/default/playbook.yml → provisioning/roles/geerlingguy.blackfire/molecule/default/converge.yml

@@ -17,6 +17,12 @@
       when: ansible_os_family == 'Debian'
 
     # Ubuntu-specific tasks.
+    - name: Add dependencies for apt key (Ubuntu).
+      apt:
+        name: dirmngr
+        state: present
+      when: ansible_distribution == 'Ubuntu'
+
     - name: Add repository for PHP 7 (Ubuntu).
       apt_repository: repo='ppa:ondrej/php'
       when: ansible_distribution == 'Ubuntu'

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

@@ -3,10 +3,9 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +16,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.blackfire/tasks/setup-Debian.yml

@@ -1,4 +1,9 @@
 ---
+- name: Ensure dirmngr is installed (gnupg dependency).
+  apt:
+    name: dirmngr
+    state: present
+
 - name: Add packagecloud apt key.
   apt_key:
     url: "{{ blackfire_gpg_key_url }}"

provisioning/roles/geerlingguy.daemonize/tests/test.yml

@@ -16,7 +16,7 @@
       changed_when: false
 
     - name: Ensure build dependencies are installed (Debian).
-      apt: 'name="{{ item }}" state=installed'
+      apt: 'name="{{ item }}" state=present'
       with_items:
         - build-essential
         - unzip

provisioning/roles/geerlingguy.elasticsearch/.travis.yml

@@ -12,7 +12,7 @@ env:
 
 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.elasticsearch/molecule/default/molecule.yml

@@ -3,10 +3,9 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +16,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.elasticsearch/tasks/setup-Debian.yml

@@ -1,7 +1,9 @@
 ---
-- name: HTTPS APT transport for Elasticsearch repository.
+- name: Add required dependencies.
   apt:
-    name: apt-transport-https
+    name:
+      - apt-transport-https
+      - gnupg2
     state: present
 
 - name: Add Elasticsearch apt key.

provisioning/roles/geerlingguy.mysql/.ansible-lint

@@ -1,3 +1,2 @@
 skip_list:
-  - '602'
   - '204'

provisioning/roles/geerlingguy.mysql/.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy

provisioning/roles/geerlingguy.mysql/.travis.yml

@@ -6,6 +6,7 @@ env:
   global:
     - ROLE_NAME: mysql
   matrix:
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: centos6
     - MOLECULE_DISTRO: ubuntu1804
@@ -14,7 +15,7 @@ env:
 
 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.mysql/README.md

@@ -84,6 +84,10 @@ The formats of these are the same as in the `mysql_user` module.
 
 (RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can be handy, as an example, if you want to install later versions of MySQL.
 
+    mysql_python_package_debian: ''
+
+(Ubuntu/Debian only) If you need to explicitly set the MySQL Python package, you can set it here. If not set, it will default to `python-mysqldb` for Python 2 and `python3-mysqldb` for Python 3.
+
     mysql_port: "3306"
     mysql_bind_address: '0.0.0.0'
     mysql_datadir: /var/lib/mysql

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

@@ -12,6 +12,7 @@ galaxy_info:
       versions:
         - 6
         - 7
+        - 8
     - name: Ubuntu
       versions:
         - all

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

@@ -3,6 +3,9 @@
   hosts: all
   become: true
 
+  vars:
+    mysql_python_package_debian: python3-mysqldb
+
   roles:
     - role: geerlingguy.mysql