Merge pull request #1045 from mhaskel/rebase_978

Allow includes necessary for basic authentication

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`

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: }

manifests/mod/authn_file.pp

@@ -0,0 +1,3 @@
+class apache::mod::authn_file {
+  ::apache::mod { 'authn_file': }
+}

manifests/mod/authz_default.pp

@@ -0,0 +1,3 @@
+class apache::mod::authz_default {
+  ::apache::mod { 'authz_default': }
+}

manifests/mod/authz_user.pp

@@ -0,0 +1,3 @@
+class apache::mod::authz_user {
+  ::apache::mod { 'authz_user': }
+}