Testing updates

.kitchen.docker.yml

@@ -12,7 +12,7 @@ verifier:
   name: inspec
 
 platforms:
-- name: centos-7.2
+- name: centos-7.3
   driver:
     image: centos:7
     platform: rhel
@@ -63,7 +63,7 @@ suites:
   - recipe[apache2_test::mod_status_remote]
 - name: prefork
   includes: [
-    'centos-7.2',
+    'centos-7.3',
     'ubuntu-14.04',
     'ubuntu-16.04'
   ]
@@ -87,7 +87,7 @@ suites:
       - test/integration/default/inspec/localhost
 - name: worker
   includes: [
-    'centos-7.2'
+    'centos-7.3'
   ]
   attributes:
     apache:

.kitchen.yml

@@ -9,25 +9,22 @@ verifier:
   name: inspec
 
 platforms:
-- name: centos-7.2
+- name: centos-7.3
+- name: ubuntu-14.04
   run_list:
-  - recipe[yum]
+  - recipe[apt]
 - name: ubuntu-16.04
   run_list:
   - recipe[apt]
 - name: debian-8.6
   run_list:
   - recipe[apt]
-- name: fedora-24
-  run_list:
-  - recipe[yum::dnf_yum_compat]
+- name: fedora-25
 - name: freebsd-10.3
 - name: amazon
   driver:
     box: mvbcoding/awslinux
 - name: opensuse-13.2
-  run_list:
-  - recipe[zypper]
 
 suites:
 - name: default
@@ -58,7 +55,7 @@ suites:
   - recipe[apache2_test::mod_status_remote]
 - name: prefork
   includes: [
-    'centos-7.2',
+    'centos-7.3',
     'debian-8.6',
     'ubuntu-14.04',
     'ubuntu-16.04'
@@ -87,7 +84,7 @@ suites:
       - test/integration/default/inspec/localhost
 - name: worker
   includes: [
-    'centos-7.2',
+    'centos-7.3',
     'ubuntu-14.04'
   ]
   attributes:

README.md

@@ -72,15 +72,16 @@ performs `pacman -Sy` to keep pacman's package cache updated.
 The following platforms and versions are tested and supported using
 [test-kitchen](http://kitchen.ci/)
 
+* Ubuntu 14.04
 * Ubuntu 16.04
 * Debian 8.6
-* CentOS 7.2
+* CentOS 7.3
+* Fedora 25
 
 The following platform families are supported in the code, and are
 assumed to work based on the successful testing on Ubuntu and CentOS.
 
 * Red Hat (rhel)
-* Fedora
 
 The following platforms are also supported in the code, have been
 tested manually but are not regularly tested under test-kitchen.
@@ -102,7 +103,7 @@ Usage
 =====
 
 Using this cookbook is relatively straightforward. It is recommended to create
-a project or organization specific [wrapper cookbook](https://www.chef.io/blog/2013/12/03/doing-wrapper-cookbooks-right/) 
+a project or organization specific [wrapper cookbook](https://www.chef.io/blog/2013/12/03/doing-wrapper-cookbooks-right/)
 and add the desired recipes to the run list of a node, or create a role. Depending on your
 environment, you may have multiple roles that use different recipes
 from this cookbook. Adjust any attributes as desired. For example, to
@@ -383,7 +384,7 @@ Definitions
 ===========
 
 The cookbook provides a few definitions. At some point in the future
-these definitions will be refactored into custom resources see 
+these definitions will be refactored into custom resources see
 [issue 414](https://github.com/sous-chefs/apache2/issues/414).
 
 apache\_conf

test/integration/default/inspec/localhost/files/platforms/centos/7.3.1611.json

@@ -0,0 +1,46 @@
+{
+    "apache": {
+        "version": "2.4",
+        "package": "httpd",
+        "devel_package": "httpd-devel",
+        "binary": "/usr/sbin/httpd",
+        "mpm": "prefork",
+        "dir": "/etc/httpd",
+        "lib_dir": "/usr/lib64/httpd",
+        "libexec_dir": "/usr/lib64/httpd/modules",
+        "cache_dir": "/var/cache/httpd",
+        "cgibin_dir": "/var/www/cgi-bin",
+        "docroot_dir": "/var/www/html",
+        "conf": "/etc/httpd/conf/httpd.conf",
+        "perl_pkg": "perl",
+        "log_dir": "/var/log/httpd",
+        "root_group": "root",
+        "service_name": "httpd",
+        "default_site_name": "default",
+        "default_site_enabled": false,
+        "default_modules": [
+            "status",
+            "alias",
+            "auth_basic",
+            "authn_file",
+            "authz_core",
+            "authz_groupfile",
+            "authz_host",
+            "authz_user",
+            "autoindex",
+            "dir",
+            "env",
+            "mime",
+            "negotiation",
+            "setenvif",
+            "systemd"
+        ],
+        "mod_ssl": {
+            "pkg_name": "mod_ssl"
+        },
+        "mod_php": {
+            "module_name": "php5",
+            "so_filename": "libphp5.so"
+        }
+    }
+}

test/integration/default/inspec/localhost/files/platforms/fedora/25.json

@@ -0,0 +1,49 @@
+{
+    "apache": {
+        "version": "2.4",
+        "package": "httpd",
+        "devel_package": "httpd-devel",
+        "binary": "/usr/sbin/httpd",
+        "mpm": "prefork",
+        "dir": "/etc/httpd",
+        "lib_dir": "/usr/lib64/httpd",
+        "libexec_dir": "/usr/lib64/httpd/modules",
+        "cache_dir": "/var/cache/httpd",
+        "cgibin_dir": "/var/www/cgi-bin",
+        "docroot_dir": "/var/www/html",
+        "conf": "/etc/httpd/conf/httpd.conf",
+        "perl_pkg": "perl",
+        "log_dir": "/var/log/httpd",
+        "root_group": "root",
+        "service_name": "httpd",
+        "default_site_name": "default",
+        "default_site_enabled": false,
+        "default_modules": [
+            "status",
+            "alias",
+            "auth_basic",
+            "authn_file",
+            "authz_core",
+            "authz_groupfile",
+            "authz_host",
+            "authz_user",
+            "autoindex",
+            "dir",
+            "env",
+            "mime",
+            "negotiation",
+            "setenvif",
+            "systemd"
+        ],
+        "mod_auth_openid": {
+            "version": "0.8"
+        },
+        "mod_ssl": {
+            "pkg_name": "mod_ssl"
+        },
+        "mod_php": {
+            "module_name": "php5",
+            "so_filename": "libphp5.so"
+        }
+    }
+}