X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=90c2f824a457f2521f8c8828421773f85581e415;hb=f021caecf7f1878c55f5e703551874c52d778c86;hp=2a5cd1fc88b5087bafc70209e787bccfc7a8471b;hpb=8dc51e021f8e7ba5d7f2c0ea7ddf66523e4ddaff;p=dsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 2a5cd1fc..90c2f824 100644
--- 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":;