Sync

diff --git a/org.gridsite.core/doc/httpd-storage.conf b/org.gridsite.core/doc/httpd-storage.conf
index b03357a..1e3db9d 100644 (file)
--- a/org.gridsite.core/doc/httpd-storage.conf
+++ b/org.gridsite.core/doc/httpd-storage.conf
@@ -1,3 +1,4 @@
+
 ##############################################################################
 ## GridSite httpd-storage.conf - Andrew McNab <Andrew.McNab@man.ac.uk>
 ##
@@ -121,6 +122,34 @@ GridSiteCastGroup 224.0.1.111:488
 
 Listen 80
 Listen 777
+NameVirtualHost 127.0.0.1:80
+
+<VirtualHost login.www.printenv.localdomain:80>
+ServerName login.www.printenv.localdomain
+
+<Directory "/var/www/html">
+ GridSiteIndexes       on
+ GridSiteAuth          on
+ GridSiteDNlists       /etc/grid-security/dn-lists/
+</Directory>
+
+ScriptAliasMatch / /var/www/cgi-bin/login.printenv.sh
+
+</VirtualHost>
+
+<VirtualHost www.printenv.localdomain:80>
+ServerName www.printenv.localdomain
+
+<Directory "/var/www/html">
+ GridSiteIndexes       on
+ GridSiteAuth          on
+ GridSiteDNlists       /etc/grid-security/dn-lists/
+</Directory>
+
+ScriptAliasMatch / /var/www/cgi-bin/printenv.sh
+
+</VirtualHost>
+
 <VirtualHost *:80 *:777>
 
 GridSiteGridHTTP  on
@@ -163,6 +192,8 @@ GridSiteCastAlias https://sitecast.domain:488/ /var/www/html/
  GridSiteDNlistsURI     /dn-lists/
  GridSiteGSIProxyLimit 9
  GridSiteMethods       GET PUT DELETE MOVE
+ GridSiteHtmlFormat     on
+ GridSiteLoginURI       https://login.www.printenv.localdomain
 </Directory>
 
 <Location "/dn-lists/">

diff --git a/org.gridsite.core/doc/mod_gridsite.8 b/org.gridsite.core/doc/mod_gridsite.8
index f6d0e29..773db99 100644 (file)
--- a/org.gridsite.core/doc/mod_gridsite.8
+++ b/org.gridsite.core/doc/mod_gridsite.8
@@ -80,7 +80,14 @@ requests made using a full X.509 certificate (not a GSI proxy.)
 .IP "GridSiteRequirePasscode on|off"
 Whether to require passcode cookies when processing HTTPS
 requests made using a full X.509 certificate (not a GSI proxy.)
-(Default: GridSiteAutoPasscode off)
+(Default: GridSiteRequirePasscode off)
+
+.IP "GridSiteZoneSlashes number"
+How many slashes to include in passcode paths. The path is the
+prefix of REQUEST_URI that includes that number of slashes. 
+Path matching is checked by mod_gridsite in addition to any
+selection of cookies by path made by the browser.
+(Default: GridSiteZoneSlashes 1)
 
 .IP "GridSiteAdminList uri"
 All members of the DN List with name "uri" receive the full set
@@ -164,6 +171,12 @@ the virtual host, outside any Directory or Location containers.
 If set, gives the URI to use for "Website Help" links in HTML
 page footers. (Default: none)
 
+.IP "GridSiteLoginURI uri"
+If set, gives the URI prefix to use for login/logout links in
+page footers. The text "Login/Logout" will be a link to the
+prefix followed by the value of REQUEST_URI for the page in
+question. (Default: none)
+
 .IP "GridSiteLink on|off"
 Turns off the link in the HTML page footers which gives credit to GridSite.
 (Default: GridSiteLink on)