Index: trunk/DataStoreServer/web/conf/httpd-datastore.conf
===================================================================
--- trunk/DataStoreServer/web/conf/httpd-datastore.conf	(revision 16763)
+++ trunk/DataStoreServer/web/conf/httpd-datastore.conf	(revision 17381)
@@ -1,5 +1,6 @@
-
-<Directory "/var/www/html/ds/dsroot">
-#<Directory "/ds/dsroot">
+#
+# Root of the data store (where the directory hierarchy lives
+#
+<Directory "/data/ipp000.0/datastore/dsroot">
 
   DirectoryIndex /ds-cgi/dsindex.cgi
@@ -14,10 +15,5 @@
   XBitHack on
 
-  # attempt to turn caching off (doesn't seem to work)
-  ExpiresActive On
-  # expires 0 seconds after access (doesn't get applied)
-  ExpiresDefault A0
-
-#AddType text/plain .txt
+  AddType text/plain .txt
   AddOutputFilter INCLUDES .txt
 
@@ -28,6 +24,10 @@
 </Directory>
 
-<Directory "/cgi-bin/ds-cgi">
-#<Directory "/ds/cgi">
+
+#
+# Location of the cgi scripts
+#
+
+<Directory "/data/ipp000.0/datastore/ds-cgi">
   Options ExecCGI
 
@@ -37,15 +37,5 @@
 </Directory>
 
-Alias       /ds/     /var/www/html/ds/dsroot/
-ScriptAlias /ds-cgi/ /var/www/cgi-bin/ds-cgi/
+Alias       /ds/     /data/ipp000.0/datastore/dsroot/
+ScriptAlias /ds-cgi/ /data/ipp000.0/datastore/ds-cgi/
 
-
-# these don't do what I want
-#AliasMatch (.*)(/index.txt)(.*) $1/$3
-
-#ScriptAliasMatch ^/.*/index.txt /ds-cgi/dsindex.cgi
-#ScriptAlias /var/www/html/ds/dsroot/pstamprequest/index.txt /ds-cgi/dsindex.cgi
-
-#RedirectMatch /ds/.*/index.txt /ds-cgi/dsindex.cgi
-#RedirectMatch /ds/.*  /ds-cgi/dsindex.cgi
-