Changeset 4688 for TI12-security/trunk/python

Timestamp:

19/12/08 12:53:30 (12 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:

• default_deployment/attributeauthority (moved) (moved from TI12-security/trunk/python/ndg.security.server/ndg/security/server/paster_templates/default_deployment/+package+/attributeauthority)
• default_deployment/ca (moved) (moved from TI12-security/trunk/python/ndg.security.server/ndg/security/server/paster_templates/default_deployment/+package+/ca)
• default_deployment/openidprovider (moved) (moved from TI12-security/trunk/python/ndg.security.server/ndg/security/server/paster_templates/default_deployment/+package+/openidprovider)
• default_deployment/services.ini_tmpl (modified) (2 diffs)
• default_deployment/sessionmanager (moved) (moved from TI12-security/trunk/python/ndg.security.server/ndg/security/server/paster_templates/default_deployment/+package+/sessionmanager)
• template.py (modified) (1 diff)

TI12-security/trunk/python/ndg.security.server/ndg/security/server/paster_templates/default_deployment/services.ini_tmpl

@@ -31 +31 @@
 
 # All Attribute Certificates issued are recorded in this dir
-attributeAuthority.attCertDir: %(here)s/siteAAttributeAuthority/attCertLog
+attributeAuthority.attCertDir: %(here)s/attributeauthority/attCertLog
 
 # Files in attCertDir are stored using a rotating file handler
@@ -41 +41 @@
 
 # Location of role mapping file
-attributeAuthority.mapConfigFile: %(here)s/siteAAttributeAuthority/siteAMapConfig.xml
+attributeAuthority.mapConfigFile: %(here)s/attributeauthority/siteAMapConfig.xml
 
 # Settings for custom AAUserRoles derived class to get user roles for given 
 # user ID
-attributeAuthority.userRolesModFilePath: %(here)s/siteAAttributeAuthority
+attributeAuthority.userRolesModFilePath: %(here)s/attributeauthority
 attributeAuthority.userRolesModName: attributeinterface
 attributeAuthority.userRolesClassName: TestAttributeInterface
 
 # Config for XML signature of Attribute Certificate
-attributeAuthority.signingPriKeyFilePath: %(here)s/siteAAttributeAuthority/aa.key
-attributeAuthority.signingCertFilePath: %(here)s/siteAAttributeAuthority/aa.crt
+attributeAuthority.signingPriKeyFilePath: %(here)s/attributeauthority/aa.key
+attributeAuthority.signingCertFilePath: %(here)s/attributeauthority/aa.crt
 attributeAuthority.caCertFilePathList: %(here)s/ca/ndg-test-ca.crt
 

TI12-security/trunk/python/ndg.security.server/ndg/security/server/paster_templates/template.py

@@ -3 +3 @@
 from paste.script.templates import Template, var, _skip_variables
 import socket
-
+_hostTuple = socket.gethostbyaddr(socket.gethostname())
+try:
+    # Get first alias from list if present
+    _hostname = _hostTuple[1][0]
+except TypeError:
+    # ... or default to hostname
+    _hostname = _hostTuple[0]
+    
 vars = [
     var('attributeAuthorityID', 
         ('Unique identity by which this Attribute Authority will be known by '
          'other trusted sites'),
-        default=socket.gethostname())
+        default=_hostname)
 ]