From f134c393d439bc9c0ed91a44e7d649c79aa8d163 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 26 Feb 2015 12:56:47 -0800
Subject: [PATCH] Add docs and update default_mods to use the new classes

---
 README.md                 | 3 +++
 manifests/default_mods.pp | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9bc6e8d67..e6f43b751 100644
--- a/README.md
+++ b/README.md
@@ -521,7 +521,10 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `auth_basic`
 * `auth_cas`* (see [`apache::mod::auth_cas`](#class-apachemodauthcas) below)
 * `auth_kerb`
+* `authn_file`
 * `authnz_ldap`*
+* `authz_default`
+* `authz_user`
 * `autoindex`
 * `cache`
 * `cgi`
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index b600b1be7..a05b5f81e 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -118,6 +118,7 @@
       }
     }
     include ::apache::mod::alias
+    include ::apache::mod::authn_file
     include ::apache::mod::autoindex
     include ::apache::mod::dav
     include ::apache::mod::dav_fs
@@ -127,7 +128,6 @@
     include ::apache::mod::negotiation
     include ::apache::mod::setenvif
     ::apache::mod { 'auth_basic': }
-    ::apache::mod { 'authn_file': }
 
     if versioncmp($apache_version, '2.4') >= 0 {
       # filter is needed by mod_deflate
@@ -141,11 +141,12 @@
       # lots of stuff seems to break without access_compat
       ::apache::mod { 'access_compat': }
     } else {
-      ::apache::mod { 'authz_default': }
+      include ::apache::mod::authz_default
     }
 
+    include ::apache::mod::authz_user
+
     ::apache::mod { 'authz_groupfile': }
-    ::apache::mod { 'authz_user': }
     ::apache::mod { 'env': }
   } elsif $mods {
     ::apache::default_mods::load { $mods: }