Sync

diff --git a/org.gridsite.core/doc/httpd-storage.conf b/org.gridsite.core/doc/httpd-storage.conf
index 600102c..fd7ae52 100644 (file)
--- a/org.gridsite.core/doc/httpd-storage.conf
+++ b/org.gridsite.core/doc/httpd-storage.conf
@@ -4,7 +4,8 @@
 ## For GridSite documentation, see http://www.gridsite.org/
 ##
 ## Example configuration file for GridSite as an HTTP(S) storage server,
-## listening on ports 80/777 (HTTP) and 443/488 (HTTPS) 
+## listening on ports 80/777 (HTTP) and 443/488 (HTTPS), and 
+## multicast UDP 224.0.1.111:488 for SiteCast file location.
 ##
 ## (777/488 is to allow firewalls to distinguish between Grid and 
 ## Web HTTP(S) traffic. See http://www.gridsite.org/wiki/IP_Ports )
@@ -73,9 +74,6 @@
 
 ServerRoot "/etc/httpd"
 
-#######!!!!!!!!!!!!!!!!!!!!
-ServerName pc63.hep.man.ac.uk
-
 PidFile logs/httpd.pid
 
 Timeout                        300
@@ -89,6 +87,11 @@ LoadModule gridsite_module   /usr/lib/httpd/modules/mod_gridsite.so
 LoadModule mime_module         /usr/lib/httpd/modules/mod_mime.so
 LoadModule dir_module          /usr/lib/httpd/modules/mod_dir.so
 
+# used for gridsite-storage tests
+LoadModule alias_module         /usr/lib/httpd/modules/mod_alias.so
+LoadModule cgi_module           /usr/lib/httpd/modules/mod_cgi.so
+LoadModule env_module           /usr/lib/httpd/modules/mod_env.so
+
 TypesConfig /etc/mime.types
 
 # User and group who will own files created by Apache
@@ -110,7 +113,7 @@ ErrorLog    logs/httpd-gridsite-errors
 HostnameLookups On
 
 # Enable SiteCast location of files via multicast
-GridSiteCastGroup 224.0.1.111:777
+GridSiteCastGroup 224.0.1.111:488
 
 ######################################################################
 # Plain unauthenticated HTTP on ports 80 and 777
@@ -121,7 +124,7 @@ Listen 777
 <VirtualHost *:80 *:777>
 
 GridSiteGridHTTP  on
-GridSiteCastAlias http://sitecast.domain:777/ /var/www/html
+GridSiteCastAlias http://sitecast.domain:777/ /var/www/html/
 
 <Directory "/var/www/html">
  GridSiteIndexes       on
@@ -151,7 +154,7 @@ SSLVerifyDepth          10
 SSLOptions              +ExportCertData +StdEnvVars
 
 GridSiteGridHTTP  on
-GridSiteCastAlias https://sitecast.domain:777/ /var/www/html
+GridSiteCastAlias https://sitecast.domain:488/ /var/www/html/
 
 <Directory "/var/www/html">
  GridSiteIndexes       on

diff --git a/org.gridsite.core/doc/httpd-webserver.conf b/org.gridsite.core/doc/httpd-webserver.conf
index f51c6a3..ad146ba 100644 (file)
--- a/org.gridsite.core/doc/httpd-webserver.conf
+++ b/org.gridsite.core/doc/httpd-webserver.conf
@@ -13,14 +13,19 @@
 ## This file should be renamed /etc/httpd/conf/httpd.conf and Apache
 ## restarted to use Apache2/GridSite as a webserver. 
 ##
-## We assume you have mod_gridsite.so in /usr/lib/httpd/modules 
-## and that you have (a) the host's hostcert.pem and hostkey.pem 
-## in /etc/grid-security/ and (b) the Certification Authorities' you
-## trust have their root certs in /etc/grid-security/certificates
+## We assume you have installed GridSite from the RPMs into locations
+## under /usr. This includes mod_gridsite.so in /usr/lib/httpd/modules 
+## and the CGI binaries in /usr/sbin. We also assume that you have
+## (a) the host's hostcert.pem and hostkey.pem in /etc/grid-security/
+## and (b) the Certification Authorities' you trust have their root 
+## certs in /etc/grid-security/certificates
 ##
 ## (You can get RPMs for many European and North American Grid CAs
 ## from https://datagrid.in2p3.fr/distribution/datagrid/security/ ) 
 ##
+## IF THESE ASSUMPTIONS ARE INCORRECT, YOU NEED TO EDIT THE CORRESPONDING
+## DIRECTORY NAMES IN THIS FILE.
+##
 ## If you want to use DN Lists in ACLs, they should be placed/downloaded
 ## in /etc/grid-security/dn-lists/ or /var/www/html/dn-lists/ 
 ## (Lists in /etc/grid-security/dn-lists/ override lists elsewhere.)

diff --git a/org.gridsite.core/src/gridsite-storage.c b/org.gridsite.core/src/gridsite-storage.c
index be7ba5f..9d076e9 100644 (file)
--- a/org.gridsite.core/src/gridsite-storage.c
+++ b/org.gridsite.core/src/gridsite-storage.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2002-6, Andrew McNab, University of Manchester
+   Copyright (c) 2002-7, Andrew McNab, University of Manchester
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or
@@ -78,21 +78,21 @@ void handle_sitecast_get(void)
   struct timeval start_timeval, wait_timeval;
   fd_set readsckts;
 
-  sitecast_domain = getenv("GRIDSITE_SRM_DOMAIN");
+  sitecast_domain = getenv("SITECAST_DOMAIN");
   if (sitecast_domain == NULL)
     {
       puts("Status: 500 Internal Server Error\n"
            "Content-Type: text/plain\n\n"
-           "No GRIDSITE_SRM_DOMAIN defined");
+           "No SITECAST_DOMAIN defined");
       return;
     }  
 
-  sitecast_port = getenv("GRIDSITE_SRM_PORT");
+  sitecast_port = getenv("SITECAST_PORT");
   if (sitecast_port == NULL)
     {
       puts("Status: 500 Internal Server Error\n"
            "Content-Type: text/plain\n\n"
-           "No GRIDSITE_SRM_PORT defined");
+           "No SITECAST_PORT defined");
       return;
     }  
 
@@ -207,12 +207,12 @@ int main()
   int   ret;
   char *method, *groups, *p;
 
-  groups = getenv("GRIDSITE_SRM_GROUPS");
+  groups = getenv("SITECAST_GROUPS");
   if (groups == NULL)
     {
       puts("Status: 500 Internal Server Error\n"
            "Content-Type: text/plain\n\n"
-           "No GRIDSITE_SRM_GROUPS defined");
+           "No SITECAST_GROUPS defined");
       return 0;
     }
 
@@ -239,7 +239,7 @@ int main()
          {
            puts("Status: 500 Internal Server Error\n"
                 "Content-Type: text/plain\n\n"
-                "Failed to parse GRIDSITE_SRM_GROUPS");
+                "Failed to parse SITECAST_GROUPS");
            return 0;
          }
        
@@ -253,11 +253,11 @@ int main()
     {
       puts("Status: 500 Internal Server Error\n"
            "Content-Type: text/plain\n\n"
-           "No groups found in GRIDSITE_SRM_GROUPS");
+           "No groups found in SITECAST_GROUPS");
       return;
     }
 
-  method = getenv("METHOD");
+  method = getenv("REQUEST_METHOD");
 
   if ((method != NULL) && (strcmp(method, "GET") == 0))
     {