cleaning up

example/idp/idp_conf.py

@@ -5,6 +5,7 @@ BASE = "http://localhost:8088/"
 
 CONFIG={
     "entityid" : "urn:mace:umu.se:saml:roland:idp",
+    "description": "My IDP",
     "service": {
         "idp": {
             "name" : "Rolands IdP",
@@ -22,14 +23,15 @@ CONFIG={
                 "urn:mace:umu.se:saml:roland:sp": {
                     "lifetime": {"minutes": 5},
                 }
-            }
+            },
+            "subject_data": "./idp.subject.db",
         }
     },
     "debug" : 1,
     "key_file" : "pki/mykey.pem",
     "cert_file" : "pki/mycert.pem",
     "metadata" : {
-        "local": ["../sp/sp.xml"],
+        #"local": ["../sp/sp.xml"],
     },
     "organization": {
         "display_name": "Rolands Identiteter",
@@ -38,6 +40,6 @@ CONFIG={
     },
     # This database holds the map between a subjects local identifier and
     # the identifier returned to a SP
-    "subject_data": "./idp.subject.db",
+    #"xmlsec_binary": "/usr/local/bin/xmlsec1",
     "attribute_map_dir" : "./attributemaps",
-}
+}

example/sp/sp_conf.py

@@ -5,6 +5,7 @@ BASE= "http://localhost:8087/"
 
 CONFIG = {
     "entityid" : "urn:mace:umu.se:saml:roland:sp",
+    "description": "My SP",
     "service": {
         "sp":{
             "name" : "Rolands SP",
@@ -26,7 +27,7 @@ CONFIG = {
     "cert_file" : "pki/mycert.pem",
     "attribute_map_dir" : "./attributemaps",
     "metadata" : {
-       "local": ["../idp/idp.xml"],
+       #"local": ["../idp/idp.xml"],
     },
     # -- below used by make_metadata --
     "organization": {
@@ -41,5 +42,6 @@ CONFIG = {
         "contact_type": "technical",
         },
     ],
+    #"xmlsec_binary":"/usr/local/bin/xmlsec1",
     "name_form": NAME_FORMAT_URI
-}
+}

example/sp/who.ini

@@ -13,7 +13,7 @@ reissue_time = 3000
 # - rememberer_name : name of the plugin for remembering (delegate)
 [plugin:saml2auth]
 use = s2repoze.plugins.sp:make_plugin
-saml_conf = sp.conf
+saml_conf = sp_conf
 rememberer_name = auth_tkt
 debug = 1
 sid_store = outstanding