Update Suma-Vagrant to PHP 7.4

README.md

@@ -39,6 +39,10 @@ This project includes a bash script "guest_ansible.sh" for executing development
   * npm-clean      - Clean node_modules directory
   * npm-install    - Execute npm install for analysis tools
 
+## Upgrading external Ansible roles
+
+To upgrade the external Ansible roles used for installing PHP, MySQL, Apache, and RVM, run `ansible-galaxy install -r ansible/requirements.yml -p ansible/roles/ --force`.
+
 ## NOTICE
 
 This project is not intended for production use at this time. *Please use this only for testing or development deployments*.

Vagrantfile

@@ -42,6 +42,8 @@ end
 Vagrant.configure(2) do |config|
 
   # config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
+  config.vbguest.installer_options = { allow_kernel_upgrade: true }
+
   config.vm.box = "geerlingguy/centos7"
   config.vm.hostname = "suma-vagrant"
   config.vm.synced_folder ".", "/vagrant", type: "sshfs"

ansible/demo.yml

@@ -6,8 +6,10 @@
   vars_files:
     - vars/main.yml
   pre_tasks:
+    - name: Update cert index
+      shell: yum -y update ca-certificates
     - yum:
-        state: present
+        state: latest
         update_cache: yes
         name:
           - mysql-devel
@@ -30,4 +32,5 @@
     - role: geerlingguy.php
     - role: suma-ansible
     - role: rvm.ruby
+      rvm1_gpg_key_server: 'hkp://keyserver.ubuntu.com'
     - role: development

ansible/requirements.yml

@@ -3,12 +3,14 @@
 - src: geerlingguy.mysql
 - src: geerlingguy.php
 - src: geerlingguy.apache
+  # Restrict version is avoid failure due to old jinja2
+  version: "3.1.4"
 - src: geerlingguy.repo-remi
 - src: geerlingguy.php-versions
 
 # from github, overriding the name and specifying a specific tag
 - src: https://github.com/NCSU-Libraries-Ansible-Roles/basic-setup.git
-  version: "v1.3.0"
+  version: "v1.4.0"
   name: basic-setup
 
 - src: https://github.com/NCSU-Libraries-Ansible-Roles/dev-open-firewall.git

ansible/roles/basic-setup/meta/.galaxy_install_info

@@ -1 +1,2 @@
-{install_date: 'Tue Jan 15 18:33:39 2019', version: v1.3.0}
+install_date: Wed Dec 15 16:05:35 2021
+version: v1.4.0

ansible/roles/basic-setup/tasks/main.yml

@@ -8,8 +8,6 @@
     state: present
     update_cache: yes
     name:
-      - https://kojipkgs.fedoraproject.org//packages/http-parser/2.7.1/3.el7/x86_64/http-parser-2.7.1-3.el7.x86_64.rpm
-      - https://kojipkgs.fedoraproject.org//packages/http-parser/2.7.1/3.el7/x86_64/http-parser-devel-2.7.1-3.el7.x86_64.rpm
       - kernel-headers
       - kernel-devel
       - git

ansible/roles/dev-open-firewall/meta/.galaxy_install_info

@@ -1 +1,2 @@
-{install_date: 'Tue Jan 15 18:33:39 2019', version: v1.1.0}
+install_date: Wed Dec 15 16:05:35 2021
+version: v1.1.0

ansible/roles/geerlingguy.apache/.ansible-lint

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

ansible/roles/geerlingguy.apache/.github/FUNDING.yml

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

ansible/roles/geerlingguy.apache/.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.

ansible/roles/geerlingguy.apache/.github/workflows/ci.yml

@@ -0,0 +1,69 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "0 5 * * 0"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.apache'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.apache'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro:
+          - centos8
+          - centos7
+          - ubuntu2004
+          - debian10
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.apache'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}

ansible/roles/geerlingguy.apache/.github/workflows/release.yml

@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.apache'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.apache'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)

ansible/roles/geerlingguy.php/molecule/default/yaml-lint.yml → ansible/roles/geerlingguy.apache/.yamllint

@@ -1,6 +1,11 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml

ansible/roles/geerlingguy.apache/README.md

@@ -1,6 +1,6 @@
 # Ansible Role: Apache 2.x
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-apache.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-apache)
+[![CI](https://github.com/geerlingguy/ansible-role-apache/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-apache/actions?query=workflow%3ACI)
 
 An Ansible Role that installs Apache 2.x on RHEL/CentOS, Debian/Ubuntu, SLES and Solaris.
 

ansible/roles/geerlingguy.apache/meta/.galaxy_install_info

@@ -1,2 +1,2 @@
-install_date: Thu Jan 30 14:39:48 2020
-version: 3.1.0
+install_date: Wed Dec 15 16:05:32 2021
+version: 3.1.4

ansible/roles/geerlingguy.apache/meta/main.yml

@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: apache
   author: geerlingguy
   description: Apache 2.x for Linux.
   company: "Midwestern Mac, LLC"

ansible/roles/geerlingguy.apache/molecule/default/molecule.yml

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

ansible/roles/geerlingguy.apache/tasks/configure-Debian.yml

@@ -5,6 +5,7 @@
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
     state: present
+    mode: 0644
   with_items: "{{ apache_ports_configuration_items }}"
   notify: restart apache
 
@@ -13,6 +14,7 @@
     src: "{{ apache_server_root }}/mods-available/{{ item }}"
     dest: "{{ apache_server_root }}/mods-enabled/{{ item }}"
     state: link
+    mode: 0644
   with_items: "{{ apache_mods_enabled }}"
   notify: restart apache
 
@@ -43,6 +45,7 @@
     src: "{{ apache_conf_path }}/sites-available/{{ apache_vhosts_filename }}"
     dest: "{{ apache_conf_path }}/sites-enabled/{{ apache_vhosts_filename }}"
     state: link
+    mode: 0644
   notify: restart apache
   when: apache_create_vhosts | bool
 

ansible/roles/geerlingguy.apache/tasks/configure-RedHat.yml

@@ -5,6 +5,7 @@
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
     state: present
+    mode: 0644
   with_items: "{{ apache_ports_configuration_items }}"
   notify: restart apache
 

ansible/roles/geerlingguy.apache/tasks/configure-Solaris.yml

@@ -5,6 +5,7 @@
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
     state: present
+    mode: 0644
   with_items: "{{ apache_ports_configuration_items }}"
   notify: restart apache
 

ansible/roles/geerlingguy.apache/tasks/configure-Suse.yml

@@ -5,6 +5,7 @@
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
     state: present
+    mode: 0644
   with_items: "{{ apache_ports_configuration_items }}"
   notify: restart apache
 

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

@@ -1,3 +1,3 @@
 skip_list:
-  - '602'
-  - '204'
+  - 'yaml'
+  - 'role-name'

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

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