ok, so package relationships aren't working for me yet

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 2a5cd1fc88b5087bafc70209e787bccfc7a8471b..90c2f824a457f2521f8c8828421773f85581e415 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,31 +1,29 @@
 class apache2 {
-       define enable_module($ensure=present, $require=apache2) {
+        include munin-node::apache
+
+       package {
+               "apache2": ensure => installed;
+               "logrotate": ensure => installed;
+       }
+
+       define enable_module($ensure=present) {
                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 {
-               apache2: ensure => installed;
-               logrotate: ensure => installed;
-       }
-
         enable_module {
                 "info":;
                 "status":;