Moving ldap.conf out of conf.d to avoid error with loading it in a vh…

…ost.
sharumpe · Nov 6, 2015 · e09747e · e09747e
1 parent 85eed0a
commit e09747e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -10,13 +10,13 @@
 
 	$configDirPath		= "/etc/apache2"
 	$infoConfigPath		= "${configDirPath}/mod_info.conf"
+	$ldapConfigPath		= "${configDirPath}/ldap.conf"
 	$statusConfigPath	= "${configDirPath}/mod_status.conf"
 
 	$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"

diff --git a/.../default/etc/apache2/conf.d/ldap.conf.erb → templates/default/etc/apache2/ldap.conf.erb b/.../default/etc/apache2/conf.d/ldap.conf.erb → templates/default/etc/apache2/ldap.conf.erb