Fixes #956: Task: ensure Apache is installed fails.

Author: geerlingguy

provisioning/requirements.yml

@@ -6,7 +6,7 @@
 - src: geerlingguy.adminer
   version: 1.1.0
 - src: geerlingguy.apache
-  version: 1.7.3
+  version: 1.7.4
 - src: geerlingguy.apache-php-fpm
   version: 1.0.2
 - src: geerlingguy.blackfire

provisioning/roles/geerlingguy.apache/.travis.yml

@@ -1,64 +1,46 @@
 ---
-sudo: required
+services: docker
 
 env:
-  global:
-    # https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306
-    DOCKER_VERSION: "1.9.1-0~trusty"
-  matrix:
-    - repository: geerlingguy/docker-centos7-ansible
-      version: latest
-      init: /usr/lib/systemd/systemd
-      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    - repository: geerlingguy/docker-centos6-ansible
-      version: latest
-      init: /sbin/init
-      run_opts: ""
-    - repository: geerlingguy/docker-ubuntu1604-ansible
-      version: latest
-      init: /lib/systemd/systemd
-      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    - repository: geerlingguy/docker-ubuntu1404-ansible
-      version: latest
-      init: /sbin/init
-      run_opts: ""
-    - repository: geerlingguy/docker-ubuntu1204-ansible
-      version: latest
-      init: /sbin/init
-      run_opts: ""
-
-services:
-  - docker
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: centos6
+    init: /sbin/init
+    run_opts: ""
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
+    init: /sbin/init
+    run_opts: ""
+  - distro: ubuntu1204
+    init: /sbin/init
+    run_opts: ""
 
 before_install:
-  # Downgrade to specific version of Docker engine.
-  - sudo apt-get update
-  - sudo apt-get remove docker-engine -yq
-  - sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"
-
   # Pull container.
-  - 'sudo docker pull ${repository}:${version}'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-    # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${repository}:${version} "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # Clean up
-  - 'sudo docker stop "$(cat ${container_id})"'
-
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

provisioning/roles/geerlingguy.apache/README.md

@@ -121,4 +121,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).

provisioning/roles/geerlingguy.apache/tasks/main.yml

@@ -9,17 +9,8 @@
   when: apache_packages is not defined
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
-
-- include: setup-Suse.yml
-  when: ansible_os_family == 'Suse'
-
-- include: setup-Debian.yml
-  when: ansible_os_family == 'Debian'
-
-- include: setup-Solaris.yml
-  when: ansible_os_family == 'Solaris'
+- include: "setup-{{ ansible_os_family }}.yml"
+  static: no
 
 # Figure out what version of Apache is installed.
 - name: Get installed version of Apache.
@@ -39,17 +30,8 @@
   when: "apache_version.split('.')[1] == '4'"
 
 # Configure Apache.
-- include: configure-RedHat.yml
-  when: ansible_os_family == 'RedHat'
-
-- include: configure-Suse.yml
-  when: ansible_os_family == 'Suse'
-
-- include: configure-Debian.yml
-  when: ansible_os_family == 'Debian'
-
-- include: configure-Solaris.yml
-  when: ansible_os_family == 'Solaris'
+- include: "configure-{{ ansible_os_family }}.yml"
+  static: no
 
 - name: Ensure Apache has selected state and enabled on boot.
   service: