From c180eeac3f61a94de911778e9e59da87545ae034 Mon Sep 17 00:00:00 2001
From: Bruno Tavares <btavare@thoughtworks.com>
Date: Tue, 15 Sep 2015 10:08:02 -0300
Subject: [PATCH] Use httpd::mod when adding Apache modules.

Replace usage of httpd_mod with the httpd::mod wrapper to allow classes
to be applied as well on RedHat systems and have the httpd service
ordering fixed.

Change-Id: If790efd7b465e77c2eca7710f79e563d69ee3783
Co-Authored-By: Danilo Ramalho <dramalho@thoughtworks.com>
---
 manifests/mod/python.pp | 2 +-
 manifests/mod/wsgi.pp   | 2 +-
 manifests/python.pp     | 2 +-
 manifests/ssl.pp        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/mod/python.pp b/manifests/mod/python.pp
index 0997887..431dbbe 100644
--- a/manifests/mod/python.pp
+++ b/manifests/mod/python.pp
@@ -20,7 +20,7 @@ class httpd::mod::python {
     require => Package['httpd'];
   }
 
-  httpd_mod { 'python': ensure => present; }
+  httpd::mod { 'python': ensure => present; }
 
 }
 
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index fef40e3..f43641f 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -20,7 +20,7 @@ class httpd::mod::wsgi {
     require => Package['httpd'];
   }
 
-  httpd_mod { 'wsgi': ensure => present; }
+  httpd::mod { 'wsgi': ensure => present; }
 
 }
 
diff --git a/manifests/python.pp b/manifests/python.pp
index 204e831..faf173f 100644
--- a/manifests/python.pp
+++ b/manifests/python.pp
@@ -20,6 +20,6 @@ class httpd::python {
     ensure => present,
     name   => $httpd::params::mod_python_package,
   }
-  httpd_mod { 'python': ensure => present, }
+  httpd::mod { 'python': ensure => present, }
 
 }
diff --git a/manifests/ssl.pp b/manifests/ssl.pp
index e3abc4c..2e1569a 100644
--- a/manifests/ssl.pp
+++ b/manifests/ssl.pp
@@ -25,7 +25,7 @@ class httpd::ssl {
       }
     }
     'ubuntu', 'debian': {
-      httpd_mod { 'ssl': ensure => present, }
+      httpd::mod { 'ssl': ensure => present, }
     }
     default: {
       fail( "${::operatingsystem} not defined in httpd::ssl.")