adding capability to configure apps. Effectively, this sets up a jkMo…

…unt for the supplied name. These queue up into a single file, so that they will be added/removed as needed.

manifests/jk.pp

@@ -2,14 +2,16 @@
 (
 	$jkLogLevel	= "error",
 	$jkWorkerHost	= "localhost",
-	$jkWorkerPort	= 8009
+	$jkWorkerPort	= 8009,
+	$apps		= []
 )
 {
 	include apache2::params
 
 	validate_string( $jkLogLevel )
 	validate_string( $jkWorkerHost )
 	validate_string( $jkWorkerPort )
+	validate_array( $apps )
 
 	# install the package
 	package { $params::jkPackageName :
@@ -27,11 +29,16 @@
 	$default  = "$mod_path/templates/default$params::jkConfigPath.erb"
 
 	# write the config file
-	file { $apache2::jkConfigPath :
+	file { $params::jkConfigPath :
 		ensure => file,
 		content => inline_template( file( $specific, $default ) ),
 		notify  => $apache2::serviceNotify,
 		require	=> Package[ $params::jkPackageName ],
 	}
 
+	# if any apps were specified, create them
+	class { 'apache2::jk::app' : }
+	if ( is_array( $apps ) and size( $apps ) > 0 ) {
+		apache2::jk::addApp{ $apps : }
+	}
 }

manifests/jk/app.pp

@@ -0,0 +1,44 @@
+class apache2::jk::app
+{
+	concat { $params::jkAppsConfigPath :
+		ensure	=> present,
+		notify  => $apache2::serviceNotify,
+		require	=> Package[ $params::jkPackageName ],
+	}
+
+
+	concat::fragment { "$params::jkAppsConfigPath-fragment-pre" :
+		target	=> $params::jkAppsConfigPath,
+		order	=> 01,
+		content	=> "<IfModule mod_jk.c>\n",
+	}
+
+	concat::fragment { "$params::jkAppsConfigPath-fragment-post" :
+		target	=> $params::jkAppsConfigPath,
+		order	=> 99,
+		content	=> "</IfModule>\n",
+	}
+}
+
+define apache2::jk::addApp
+(
+	$appName = $name
+)
+{
+	include apache2::params
+
+	validate_string( $appName )
+
+	# Pick the template path we're going to use
+	$mod_path = get_module_path('apache2')
+	$specific = "$mod_path/templates/$operatingsystem/$operatingsystemrelease$params::jkAppsConfigPath-app-fragment.erb"
+	$default  = "$mod_path/templates/default$params::jkAppsConfigPath-app-fragment.erb"
+
+	# write the config file
+	concat::fragment { $appName :
+		target	=> $params::jkAppsConfigPath,
+		order	=> 10,
+		content => inline_template( file( $specific, $default ) ),
+	}
+
+}

manifests/params.pp

@@ -15,8 +15,10 @@
 	$configConfdPath	= "${configDirPath}/conf.d"
 	$accessConfigPath	= "${configConfdPath}/access.conf"
 	$jkConfigPath		= "${configConfdPath}/jk.conf"
+	$jkAppsConfigPath	= "${configConfdPath}/jkApps.conf.inc"
 	$ldapConfigPath		= "${configConfdPath}/ldap.conf"
 	$phpConfigPath		= "${configConfdPath}/php5.conf"
+	$phpAppsConfigPath	= "${configConfdPath}/php5Apps.conf.inc"
 	$remoteIpConfigPath	= "${configConfdPath}/remoteip.conf"
 	$traceEnableConfigPath	= "${configConfdPath}/trace.conf"
 

templates/default/etc/apache2/conf.d/jk.conf.erb

@@ -40,5 +40,5 @@
 	# Set properties for the status worker
 	JkWorkerProperty	worker.status.type=status
 
-	Include /etc/apache2/conf.d/jk.d/*.mount
+	IncludeOptional /etc/apache2/conf.d/jkApps.conf.inc
 </IfModule>

templates/default/etc/apache2/conf.d/jkApps.conf.inc-app-fragment.erb

@@ -0,0 +1,6 @@
+	<Location "/<%= @appName -%>*">
+		# see conf.d/access.conf for other access controls
+		JkMount localJvm1
+		Require host localhost
+		Require ip 127.0.0.1
+	</Location>