making sure everyone has the proper require and notify configs.

sharumpe · Dec 3, 2014 · 4dc0f7f · 4dc0f7f
1 parent 4f866f4
commit 4dc0f7f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/manifests/access.pp b/manifests/access.pp
@@ -1,9 +1,13 @@
 class apache2::access {
+	include apache2::params
+
 	#
 	# Create the file we're storing these in
 	#
 	concat { $params::accessConfigPath :
 		ensure	=> present,
+		notify  => $apache2::serviceNotify,
+		require	=> Package[ $params::jkPackageName ],
 	}
 }
 

diff --git a/manifests/modules.pp b/manifests/modules.pp
@@ -12,6 +12,8 @@
 		file_line { 'clear_module_list' :
 			path	=> $params::sysconfigPath,
 			line	=> 'APACHE_MODULES=""',
+			notify	=> $apache2::serviceNotify,
+			require	=> Package[ $params::packageName ],
 		}
 
 		# enable the modules specified
@@ -25,9 +27,9 @@
 {
 	# Enable the module
 	exec { "enable_${name}" :
-	    command => "/usr/sbin/a2enmod ${name}",
-	    unless  => "/usr/sbin/a2enmod -q ${name}",
-	    require => Package[ $params::packageName ],
-	    notify	=> $apache2::serviceNotify,
+		command => "/usr/sbin/a2enmod ${name}",
+		unless  => "/usr/sbin/a2enmod -q ${name}",
+		notify	=> $apache2::serviceNotify,
+		require	=> Package[ $params::packageName ],
 	}
 }
diff --git a/manifests/statusandinfo.pp b/manifests/statusandinfo.pp
@@ -21,11 +21,13 @@
 	file { $params::statusConfigPath :
 		ensure	=> present,
 		source	=> "puppet:///modules/apache2/default${params::statusConfigPath}",
+		notify  => $apache2::serviceNotify,
 		require	=> Package[ $params::packageName ],
 	}
 	file { $params::infoConfigPath :
 		ensure	=> present,
 		source	=> "puppet:///modules/apache2/default${params::infoConfigPath}",
+		notify  => $apache2::serviceNotify,
 		require	=> Package[ $params::packageName ],
 	}
 

diff --git a/manifests/sysconfig.pp b/manifests/sysconfig.pp
@@ -19,12 +19,14 @@
 		path	=> $params::sysconfigPath,
 		line	=> "APACHE_SERVERSIGNATURE = \"${serverSignature}\"",
 		match	=> "^APACHE_SERVERSIGNATURE\s*=",
-        notify	=> $apache2::serviceNotify,
+        	notify	=> $apache2::serviceNotify,
+		require	=> Package[ $params::packageName ],
 	}
 	file_line { 'serverTokensRule' :
 		path	=> $params::sysconfigPath,
 		line	=> "APACHE_SERVERTOKENS=\"${serverTokens}\"",
 		match	=> "^APACHE_SERVERTOKENS=",
 		notify	=> $apache2::serviceNotify,
+		require	=> Package[ $params::packageName ],
 	}
 }
diff --git a/manifests/traceenable.pp b/manifests/traceenable.pp
@@ -14,10 +14,12 @@
 	else {
 		$content = "TraceEnable off"
 	}
-	
+
 	file { $params::traceEnableConfigPath :
 		ensure	=> file,
 		content	=> $content,
+		notify  => $apache2::serviceNotify,
+		require	=> Package[ $params::packageName ],
 	}
 
 }