vhost.erb in keithsalisbury-subtrac-0.1.7

- old
+ new
@@ -1,35 +1,35 @@
 <virtualhost *>
 	ServerAdmin webmaster@localhost
 	ServerName <%= @server_hostname %>
 	DocumentRoot <%= @docs_dir %>
-	ErrorLog <%= @APP_CONFIG[:dirs][:log] %>/error.<%= @server_hostname %>.log
-	CustomLog <%= @APP_CONFIG[:dirs][:log] %>/access.<%= @server_hostname %>.log combined
+	ErrorLog <%= @log_dir %>/error.<%= @server_hostname %>.log
+	CustomLog <%= @log_dir %>/access.<%= @server_hostname %>.log combined
 	LogLevel error
 
 	RewriteEngine On
-	RewriteRule ^/$ http://<%= @server_hostname %>/saint/public
-	RewriteRule ^/index*$ http://<%= @server_hostname %>/saint/public
+	RewriteRule ^/$ http://<%= @server_hostname %>/<%= @default_client %>/<%= @default_project %>
+	RewriteRule ^/index*$ http://<%= @server_hostname %>/<%= @default_client %>/<%= @default_project %>
 
 	<location />
 		AuthType Basic
-		AuthName 'SaintDigitalSourceRepository'
+		AuthName '<%= @server_name %>'
 		AuthUserFile <%= @APP_CONFIG[:dirs][:install] %>/passwords
 		#Require valid-user
-		AuthBasicProvider file ldap
-		AuthLDAPBindDN 'CN=WTMS LDAP Auth,OU=WTMS,OU=STS,OU=Europe,OU=EMEA-YR-LON-GLH,OU=EMEA-YR-LON,OU=EMEA-YR,DC=emea,DC=corp,DC=yr,DC=com'
-		AuthLDAPBindPassword 'l00kmeup'
-		AuthLDAPURL 'ldap://emea-root03.emea.corp.yr.com:389/dc=emea,dc=corp,dc=yr,dc=com?sAMAccountName?sub?(&(objectClass=user)(memberOf=cn=EMEA-YR-LON-GLH-SAINT-DEVELOPERS,ou=Groups,ou=Saint,ou=RKCRYR,ou=EMEA-YR-LON-GLH,ou=EMEA-YR-LON,ou=EMEA-YR,dc=emea,dc=corp,dc=yr,dc=com))'
-		AuthzLDAPAuthoritative off
+		#AuthBasicProvider file ldap
+		#AuthLDAPBindDN '<%= @ldap_bind_dn %>'
+		#AuthLDAPBindPassword '<%= @ldap_bind_password %>'
+		#AuthLDAPURL '<%= @ldap_url %>'
+		#AuthzLDAPAuthoritative off
 	</location>
 
 	<location <%= @APP_CONFIG[:urls][:svn] %>>
 		DAV svn
 		SVNParentPath <%= @APP_CONFIG[:dirs][:svn] %>/
 		SVNListParentPath On
 		SVNAutoversioning On
-		SVNReposName 'SaintDigitalSourceRepository'
+		SVNReposName '<%= @server_name %>'
 	</location>
 
-	Include <%= @APP_CONFIG[:dirs][:conf_locations] %>/*
+	Include <%= @locations_dir %>/*
 
 </virtualhost>
\ No newline at end of file