Changeset 4683 for TI12-security/trunk/python

Timestamp:

19/12/08 11:11:55 (11 years ago)

Author:

pjkersha

Message:

• paster template - more settings in place for default security services template

Location:

TI12-security/trunk/python/ndg.security.server/ndg/security/server/templates

Files:

• default_project/+package+/openidprovider/README_tmpl (added)
• default_project/+package+/openidprovider/layout (added)
• default_project/+package+/openidprovider/layout/NERC_Logo.gif_tmpl (added)
• default_project/+package+/openidprovider/layout/NERC_Logo_Swindon.gif_tmpl (added)
• default_project/+package+/openidprovider/layout/badc logo_sm.jpg_tmpl (added)
• default_project/+package+/openidprovider/layout/badc_logo4ndg.jpg_tmpl (added)
• default_project/+package+/openidprovider/layout/icons (added)
• default_project/+package+/openidprovider/layout/icons/help.png_tmpl (added)
• default_project/+package+/openidprovider/layout/ndg2.css_tmpl (added)
• default_project/+package+/openidprovider/layout/ndg_logo_circle.gif_tmpl (added)
• default_project/+package+/openidprovider/layout/neodc_logo4ndg.jpg_tmpl (added)
• default_project/+package+/openidprovider/layout/openid-inputicon.gif_tmpl (added)
• default_project/+package+/openidprovider/layout/stfc-circle-sm.gif_tmpl (added)
• default_project/+package+/openidprovider/templates (added)
• default_project/+package+/openidprovider/templates/ndg (added)
• default_project/+package+/openidprovider/templates/ndg/__init__.py (added)
• default_project/+package+/openidprovider/templates/ndg/security (added)
• default_project/+package+/openidprovider/templates/ndg/security/__init__.py (added)
• default_project/+package+/openidprovider/templates/ndg/security/decidePage.kid_tmpl (added)
• default_project/+package+/openidprovider/templates/ndg/security/error.kid_tmpl (added)
• default_project/+package+/openidprovider/templates/ndg/security/identityPage.kid_tmpl (added)
• default_project/+package+/openidprovider/templates/ndg/security/login.kid_tmpl (added)
• default_project/+package+/openidprovider/templates/ndg/security/mainPage.kid_tmpl (added)
• default_project/+package+/openidprovider/templates/ndg/security/ndgPage.kid_tmpl (added)
• default_project/+package+/sessionmanager/userx509certauthn.py_tmpl (moved) (moved from TI12-security/trunk/python/ndg.security.server/ndg/security/server/templates/default_project/+package+/sessionmanager/userx509certauthn.py)
• default_project/services.ini_tmpl (modified) (2 diffs)
• template.py (modified) (1 diff)

TI12-security/trunk/python/ndg.security.server/ndg/security/server/templates/default_project/services.ini_tmpl

@@ -46 +46 @@
 # user ID
 attributeAuthority.userRolesModFilePath: %(here)s/siteAAttributeAuthority
-attributeAuthority.userRolesModName: siteAUserRoles
-attributeAuthority.userRolesClassName: TestUserRoles
+attributeAuthority.userRolesModName: attributeinterface
+attributeAuthority.userRolesClassName: TestAttributeInterface
 
 # Config for XML signature of Attribute Certificate
-attributeAuthority.signingPriKeyFilePath: %(here)s/siteAAttributeAuthority/siteA-aa.key
-attributeAuthority.signingCertFilePath: %(here)s/siteAAttributeAuthority/siteA-aa.crt
+attributeAuthority.signingPriKeyFilePath: %(here)s/siteAAttributeAuthority/aa.key
+attributeAuthority.signingCertFilePath: %(here)s/siteAAttributeAuthority/aa.crt
 attributeAuthority.caCertFilePathList: %(here)s/ca/ndg-test-ca.crt
 
@@ -190 +190 @@
            SessionMiddlewareFilter
            OpenIDProviderFilter
-           testHarnessFilter
            mainApp
 
-[filter:testHarnessFilter]
-paste.filter_app_factory = 
-        ndg.security.test.combinedservices.serverapp:filter_app_factory
-sessionManagerFilterID = filter:SessionManagerFilter
-attributeAuthorityFilterID = filter:AttributeAuthorityFilter
 
 #______________________________________________________________________________

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

@@ -2 +2 @@
 
 from paste.script.templates import Template, var, _skip_variables
+import socket
 
 vars = [
-    var('attributeAuthorityID', 'Unique identity by which this Attribute Authority will be known by other trusted sites'),
-    var('NDGSEC_CONFIG_DIR', 'root directory location for configuration files')
+    var('attributeAuthorityID', 
+        ('Unique identity by which this Attribute Authority will be known by '
+         'other trusted sites'),
+        default=socket.gethostname())
 ]
 
 class DefaultProjectTemplate(Template):
     _template_dir = 'default_project'
-    summary = 'NERC DataGrid Security services application template'
+    summary = 'NERC DataGrid Security services deployment template'
     vars = vars
+