move module enable inside class definition?

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index ad09884..2a5cd1f 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,24 +1,24 @@
-define enable_module($ensure=present, $require=apache2) {
-        case $ensure {
-                present: {
-                        exec { "/usr/sbin/a2enmod $name":
-                                unless => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]'",
-                                notify => Exec["force-reload-apache2"],
-                                require => Package[$require],
-                        }
-                }
-                absent: {
-                        exec { "/usr/sbin/a2dismod $name":
-                                onlyif => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]'",
-                                notify => Exec["force-reload-apache2"],
-                                require => Package[$require],
-                        }
-                }
-                default: { err ( "Unknown ensure value: '$ensure'" ) }
-         }
-}
-
 class apache2 {
+       define enable_module($ensure=present, $require=apache2) {
+               case $ensure {
+                       present: {
+                               exec { "/usr/sbin/a2enmod $name":
+                                       unless => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]'",
+                                       notify => Exec["force-reload-apache2"],
+                                       require => Package[$require],
+                               }
+                       }
+                       absent: {
+                               exec { "/usr/sbin/a2dismod $name":
+                                       onlyif => "/bin/sh -c '[ -L /etc/apache2/mods-enabled/${name}.load ]'",
+                                       notify => Exec["force-reload-apache2"],
+                                       require => Package[$require],
+                               }
+                       }
+                       default: { err ( "Unknown ensure value: '$ensure'" ) }
+                }
+       }
+
         include munin-node::apache
 
        package {