Changeset 43041

Timestamp:

Jun 1, 2026, 9:52:37 AM (6 weeks ago)

Author:

eugene

Message:

fix rewrite to handle error; add trailing slash to ScriptAlias

Location:

branches/eam_branches/ipp-pstamp-20260421/DataStoreServer

Files:

• example/commands.sh (modified) (1 diff)
• web/conf/ubuntu-datastore.conf (modified) (2 diffs)

branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/example/commands.sh

@@ -1 @@
-dsprodtool --add mytest2 --type sample --description quick
-dsreg --add myfs --product mytest --type dump --list fs_example.txt --datapath . --copy
+dsprodtool --add mytest --type ipp-misc --description quick
+dsreg --add myfs --product mytest --type PSREQUEST --list fs_example.txt --datapath . --copy

branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/web/conf/ubuntu-datastore.conf

@@ -11 +11 @@
     DocumentRoot "/var/www/html"
 
-    Alias       /ds     /data/MYHOST.0/datastore/dsroot/
-    ScriptAlias /ds-cgi /data/MYHOST.0/datastore/ds-cgi/
+    Alias       /ds      /data/MYHOST.0/datastore/dsroot/
+    ScriptAlias /ds-cgi/ /data/MYHOST.0/datastore/ds-cgi/
 
     # ensure requests like http://datastore/foo/bar become http://datastore/ds/foo/bar
@@ -19 +19 @@
     RewriteCond %{REQUEST_URI} !^/ds(/|$)
     RewriteCond %{REQUEST_URI} !^/ds-cgi(/|$)
+    RewriteCond %{REQUEST_URI} !^/error(/|$)
     RewriteRule ^/(.*)$ /ds/$1 [R=301,L]