Changeset 4688 for TI12-security


Ignore:
Timestamp:
19/12/08 12:53:30 (11 years ago)
Author:
pjkersha
Message:

default_deployment paster template doesn't need package directory

Location:
TI12-security/trunk/python/ndg.security.server/ndg/security/server/paster_templates
Files:
2 edited
4 moved

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/paster_templates/default_deployment/services.ini_tmpl

    r4684 r4688  
    3131 
    3232# All Attribute Certificates issued are recorded in this dir 
    33 attributeAuthority.attCertDir: %(here)s/siteAAttributeAuthority/attCertLog 
     33attributeAuthority.attCertDir: %(here)s/attributeauthority/attCertLog 
    3434 
    3535# Files in attCertDir are stored using a rotating file handler 
     
    4141 
    4242# Location of role mapping file 
    43 attributeAuthority.mapConfigFile: %(here)s/siteAAttributeAuthority/siteAMapConfig.xml 
     43attributeAuthority.mapConfigFile: %(here)s/attributeauthority/siteAMapConfig.xml 
    4444 
    4545# Settings for custom AAUserRoles derived class to get user roles for given  
    4646# user ID 
    47 attributeAuthority.userRolesModFilePath: %(here)s/siteAAttributeAuthority 
     47attributeAuthority.userRolesModFilePath: %(here)s/attributeauthority 
    4848attributeAuthority.userRolesModName: attributeinterface 
    4949attributeAuthority.userRolesClassName: TestAttributeInterface 
    5050 
    5151# Config for XML signature of Attribute Certificate 
    52 attributeAuthority.signingPriKeyFilePath: %(here)s/siteAAttributeAuthority/aa.key 
    53 attributeAuthority.signingCertFilePath: %(here)s/siteAAttributeAuthority/aa.crt 
     52attributeAuthority.signingPriKeyFilePath: %(here)s/attributeauthority/aa.key 
     53attributeAuthority.signingCertFilePath: %(here)s/attributeauthority/aa.crt 
    5454attributeAuthority.caCertFilePathList: %(here)s/ca/ndg-test-ca.crt 
    5555 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/paster_templates/template.py

    r4687 r4688  
    33from paste.script.templates import Template, var, _skip_variables 
    44import socket 
    5  
     5_hostTuple = socket.gethostbyaddr(socket.gethostname()) 
     6try: 
     7    # Get first alias from list if present 
     8    _hostname = _hostTuple[1][0] 
     9except TypeError: 
     10    # ... or default to hostname 
     11    _hostname = _hostTuple[0] 
     12     
    613vars = [ 
    714    var('attributeAuthorityID',  
    815        ('Unique identity by which this Attribute Authority will be known by ' 
    916         'other trusted sites'), 
    10         default=socket.gethostname()) 
     17        default=_hostname) 
    1118] 
    1219 
Note: See TracChangeset for help on using the changeset viewer.