From: Jeff Godin <jgodin@tadl.org>
Date: Thu, 14 May 2015 18:25:22 +0000 (-0700)
Subject: LP#1312309: JSPAC: remove index.xml from apache example configs and examples in docum... 
X-Git-Tag: sprint4-merge-nov22~1211
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c6870e2347cb0616912a3c75cfbafe9dbe17f7a7;p=working%2FEvergreen.git

LP#1312309: JSPAC: remove index.xml from apache example configs and examples in documentation

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
---

diff --git a/Open-ILS/examples/apache/eg.conf.in b/Open-ILS/examples/apache/eg.conf.in
index 368b05761d..19d8736652 100644
--- a/Open-ILS/examples/apache/eg.conf.in
+++ b/Open-ILS/examples/apache/eg.conf.in
@@ -145,7 +145,7 @@ NameVirtualHost *:443
 	ServerName localhost:80
 	ServerAlias 127.0.0.1:80
  	DocumentRoot @localstatedir@/web/
-	DirectoryIndex index.xml index.html index.xhtml
+	DirectoryIndex index.html index.xhtml
     # - absorb the shared virtual host settings
     Include eg_vhost.conf
 </VirtualHost>
diff --git a/Open-ILS/examples/apache_24/eg.conf.in b/Open-ILS/examples/apache_24/eg.conf.in
index 33f7d03268..72bcd5ec8a 100644
--- a/Open-ILS/examples/apache_24/eg.conf.in
+++ b/Open-ILS/examples/apache_24/eg.conf.in
@@ -139,7 +139,7 @@ ExpiresByType text/css "access plus 50 minutes"
 	ServerName localhost:80
 	ServerAlias 127.0.0.1:80
  	DocumentRoot @localstatedir@/web/
-	DirectoryIndex index.xml index.html index.xhtml
+	DirectoryIndex index.html index.xhtml
     # - absorb the shared virtual host settings
     Include eg_vhost.conf
 </VirtualHost>
diff --git a/docs/TechRef/KidsOPAC.txt b/docs/TechRef/KidsOPAC.txt
index 832dd8e973..a9293d9082 100644
--- a/docs/TechRef/KidsOPAC.txt
+++ b/docs/TechRef/KidsOPAC.txt
@@ -105,7 +105,7 @@ along the lines of:
 <VirtualHost *:80>
     ServerName xyz.dev198.esilibrary.com:80
     DocumentRoot /openils/var/web/
-    DirectoryIndex index.xml index.html index.xhtml
+    DirectoryIndex index.html index.xhtml
     Include eg_vhost.conf
     <Location /eg/kpac>
 	#Point to a different kpac.xml config file if needed
diff --git a/docs/admin/template_toolkit.txt b/docs/admin/template_toolkit.txt
index 75391a5fa9..90224662f5 100644
--- a/docs/admin/template_toolkit.txt
+++ b/docs/admin/template_toolkit.txt
@@ -187,7 +187,7 @@ we only show the configuration for port 80.
 <VirtualHost *:80>
     ServerName br1.concat.ca
     DocumentRoot /openils/var/web/
-    DirectoryIndex index.xml index.html index.xhtml
+    DirectoryIndex index.html index.xhtml
     Include eg_vhost.conf
     <Location /eg>
         PerlAddVar OILSWebTemplatePath "/openils/var/templates_BR1"
@@ -197,7 +197,7 @@ we only show the configuration for port 80.
 <VirtualHost *:80>
     ServerName br2.concat.ca
     DocumentRoot /openils/var/web/
-    DirectoryIndex index.xml index.html index.xhtml
+    DirectoryIndex index.html index.xhtml
     Include eg_vhost.conf
     <Location /eg>
         PerlAddVar OILSWebTemplatePath "/openils/var/templates_BR2"