8 files changed, 30 insertions, 29 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index de1544d0..c4645662 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -45,18 +45,6 @@ class apache {
         }
     }
 
-    class mod_perl inherits base {
-        package { "apache-mod_perl": }
-    }
-
-    class mod_fcgid inherits base {
-        package { "apache-mod_fcgid": }
-    }
-
-    class mod_fastcgi inherits base {
-        package { "apache-mod_fastcgi": }
-    }
-
     class mod_wsgi inherits base {
         package { "apache-mod_wsgi": }
 
@@ -69,21 +57,6 @@ class apache {
         }
     }
 
-    class mod_proxy inherits base {
-        package { "apache-mod_proxy": }
-    }
-
-    class mod_public_html inherits base {
-        package { "apache-mod_public_html": }
-    }
-
-    class mod_deflate inherits base {
-        package { "apache-mod_deflate": }
-    }
-
-    class mod_geoip inherits base {
-        package { "apache-mod_geoip": }
-    }
 
     define vhost_base($content = '',
                       $location = '/dev/null', 
@@ -127,7 +100,7 @@ class apache {
         }
 
         if $enable_public_html {
-            include apache::mod_public_html
+            include apache::mod::public_html
         }
 
         apache::config { "/etc/httpd/conf/vhosts.d/$filename":
@@ -207,7 +180,7 @@ class apache {
     define vhost_reverse_proxy($url,
                                $vhost = false, 
                                $use_ssl = false) {
-        include apache::mod_proxy
+        include apache::mod::proxy
         vhost_base { $name:
             use_ssl => $use_ssl,
             vhost => $vhost,
diff --git a/modules/apache/manifests/mod/deflate.pp b/modules/apache/manifests/mod/deflate.pp
new file mode 100644
index 00000000..0e2211aa
--- /dev/null
+++ b/modules/apache/manifests/mod/deflate.pp
@@ -0,0 +1,4 @@
+class apache::mod::deflate {
+    include apache::base
+    package { 'apache-mod_deflate': }
+}
diff --git a/modules/apache/manifests/mod/fastcgi.pp b/modules/apache/manifests/mod/fastcgi.pp
new file mode 100644
index 00000000..4f10ccab
--- /dev/null
+++ b/modules/apache/manifests/mod/fastcgi.pp
@@ -0,0 +1,4 @@
+class apache::mod::fastcgi {
+    include apache::base
+    package { 'apache-mod_fastcgi': }
+}
diff --git a/modules/apache/manifests/mod/fcgid.pp b/modules/apache/manifests/mod/fcgid.pp
new file mode 100644
index 00000000..6c815681
--- /dev/null
+++ b/modules/apache/manifests/mod/fcgid.pp
@@ -0,0 +1,4 @@
+class apache::mod::fcgid {
+    include apache::base
+    package { 'apache-mod_fcgid': }
+}
diff --git a/modules/apache/manifests/mod/geoip.pp b/modules/apache/manifests/mod/geoip.pp
new file mode 100644
index 00000000..7f5516bc
--- /dev/null
+++ b/modules/apache/manifests/mod/geoip.pp
@@ -0,0 +1,4 @@
+class apache::mod::geoip {
+    include apache::base
+    package { 'apache-mod_geoip': }
+}
diff --git a/modules/apache/manifests/mod/perl.pp b/modules/apache/manifests/mod/perl.pp
new file mode 100644
index 00000000..2c52bf50
--- /dev/null
+++ b/modules/apache/manifests/mod/perl.pp
@@ -0,0 +1,4 @@
+class apache::mod::perl {
+    include apache::base
+    package { 'apache-mod_perl': }
+}
diff --git a/modules/apache/manifests/mod/proxy.pp b/modules/apache/manifests/mod/proxy.pp
new file mode 100644
index 00000000..80180d62
--- /dev/null
+++ b/modules/apache/manifests/mod/proxy.pp
@@ -0,0 +1,4 @@
+class apache::mod::proxy {
+    include apache::base
+    package { 'apache-mod_proxy': }
+}
diff --git a/modules/apache/manifests/mod/public_html.pp b/modules/apache/manifests/mod/public_html.pp
new file mode 100644
index 00000000..b5691b53
--- /dev/null
+++ b/modules/apache/manifests/mod/public_html.pp
@@ -0,0 +1,4 @@
+class apache::mod::public_html {
+    include apache::base
+    package { 'apache-mod_public_html': }
+}