Changeset 2736 for TI05-delivery


Ignore:
Timestamp:
18/07/07 11:22:50 (12 years ago)
Author:
domlowe
Message:

moving the passwordFile and configFile variables so they respect %(here)s - needed to start paster from /etc/init.d at boot up

Location:
TI05-delivery/ows_framework/trunk/ows_server
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/trunk/ows_server/development.ini

    r2695 r2736  
    99smtp_server = localhost 
    1010error_email_from = paste@localhost 
    11 configfile = ows_server/config/ndgDiscovery.config 
    1211 
    1312[server:main] 
     
    3231publish_dir=%(here)s/ows_server/private/filestore   
    3332ows_common_config = %(here)s/eg_ows_capabilities.xml 
     33configfile = %(here)s/ows_server/config/ndgDiscovery.config 
     34#the password file needs to be outside the egg: 
     35passwordFile =  %(here)s/ows_server/config/passwords.txt   
    3436 
    3537 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/ndgDiscovery.config

    r2675 r2736  
    1111# the following is the server on which this browse/discovery instance runs! 
    1212server:         http://localhost:8080 
    13 passwordFile:   ./ows_server/config/passwords.txt 
    14 #/home/bnl/sandboxes/ndg/TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/passwords.txt 
    1513# 
    1614# the following is the server on which the NDG discovery service is running! (Not to be confused with 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/ndgMiddleware.py

    r2703 r2736  
    22from paste.deploy import CONFIG 
    33from ows_server.models.Utilities import myConfig 
    4  
    54class ndgMiddleware: 
    65     
     
    1110         
    1211        #set up the ndg configuration file 
    13         cf=CONFIG.get('configfile') 
     12         
     13        #Changed by Dom: CONFIG.get wasn't respecting the %(home)s variable, so moved to app_conf section in ini file. 
     14        #cf=CONFIG.get('configfile') 
     15        cf= CONFIG['app_conf']['configfile'] 
    1416        cf=myConfig(cf) 
    1517       
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/Utilities.py

    r2646 r2736  
    2525       self.config=ConfigParser.ConfigParser() 
    2626       if not os.path.exists(configfile):  
    27             
    2827           raise ValueError("Config file [%s] doesn't exist in [%s]"%(configfile,os.getcwd())) 
    2928       self.config.read(configfile) 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/ndgRetrieve.py

    r2694 r2736  
    22import cgi,time 
    33from Utilities import myConfig 
    4  
     4from paste.deploy import CONFIG 
    55 
    66debug=0 
     
    2323            return 0,'The uri [%s] is not available on [%s]'%(uri,server) 
    2424        er=config.get('NDG_EXIST',uri.repository) 
    25         pwf=config.get('DEFAULT','passwordFile') 
     25         
     26        #Changes by Dom: 
     27        #pwf=config.get('DEFAULT','passwordFile')   
     28        #passwordFile is now in development.ini, moved from ndgDiscovery.config 
     29        pwf=cf= CONFIG['app_conf']['passwordFile'] 
    2630        ws=DocumentRetrieve.DocumentRetrieve(er,pwfile=pwf) 
    2731        return 1,ws 
Note: See TracChangeset for help on using the changeset viewer.