Changes between Version 50 and Version 51 of instructions

Show
Ignore:
Timestamp:
06/24/10 14:06:10 (9 years ago)
Author:
chase (IP: 152.3.136.123)
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • instructions

    v50 v51  
    1717 
    18184. Edit tomcat/start.sh and stop.sh to set CATALINA_HOME to point to the tomcat directory.  Also in start.sh and stop.sh: set ORCA_HOME to the directory with the container configuration files (e.g., /opt/orca).  
     19 
     20{{{ 
     21export ORCA_HOME=/opt/orca 
     22}}} 
    1923 
    20245. Edit tomcat/conf/server.xml and tomcat/server/classes/webauth.xml to change references to '/shirako' to the new location of the directory you created (e.g., /opt/orca). Only do this step if you are using webauth authentication. If you are not sure, then you are not. Webauth authentication requires significant setup from your identity provider. 
     
    3943}}} 
    4044 
     45=== Generating the GENI-ORCA container configuration files === 
    4146 
    42 ==== Generating the GENI-ORCA web application ==== 
     47The configuration files for the container reside in [https://geni-orca.renci.org/orca-doc/current/guides/container-configuration/config-files.html ORCA_HOME].  The config files include a security configuration, with certificates and a keystore. 
     48 
     49==== 1.2 (Bella) and following releases ==== 
     50 
     51Starting from release 1.2 ORCA '''no longer packages config/ or runtime/ directories into the webapp'''.   
     52{{{ 
     53$ cd tools/config 
     54$ ant security.create.admin.config 
     55}}} 
     56Define $ORCA_HOME (e.g. export ORCA_HOME=/opt/orca) 
     57{{{ 
     58$ cp -r runtime $ORCA_HOME 
     59$ cp -r scripts $ORCA_HOME 
     60}}} 
     61 
     62Edit the configuration files (container.properties etc.) under webapp/ and similarly copy it under the $ORCA_HOME 
     63{{{ 
     64$ cd ../../webapp 
     65$ vi config/container.properties 
     66$ cp -r config $ORCA_HOME 
     67}}} 
     68 
     69 
     70=== 1.1-alpha and previous releases === 
     71 
     72If your filesystem 
     73supports symbolic links, simply use the provided ant task: 
     74 
     75{{{ 
     76$ ant prepare.use 
     77}}} 
     78 
     79This task will generate the admin security configuration and place links to it in the relevant directories. It will also initialize and link other directories 
     80needed to build/test drivers.  
     81 
     82If your file system does not support symbolic links or you want more control over the process you can try the following steps: 
     83 
     841. Create the security configuration by going to tools/config and running 
     85{{{ 
     86$ cd tools/config 
     87$ ant security.create.admin.config 
     88}}} 
     89 
     90'''NOTE:''' Make sure there is no existing runtime directory before you run this command unless you know what you are doing. 
     91 
     922. Copy or softlink the resulting runtime/ directory to the orca/webapp directory. 
     93 
     94=== Generating the GENI-ORCA web application === 
    4395 
    4496