diff --git a/fas/dev.cfg b/fas/dev.cfg index ee5f177..a679173 100644 --- a/fas/dev.cfg +++ b/fas/dev.cfg @@ -54,7 +54,7 @@ tg.strict_parameters = True server.webpath='/fas' base_url_filter.on=True -base_url = "http://publictest1.fedoraproject.org" +base_url = "https://publictest1.fedoraproject.org" # Make the session cookie only return to the host over an SSL link # Disabled for testing. diff --git a/fas/fas/fasLDAP.py b/fas/fas/fasLDAP.py index c5dd9ce..1e29f36 100644 --- a/fas/fas/fasLDAP.py +++ b/fas/fas/fasLDAP.py @@ -390,7 +390,7 @@ class Person(object): 'givenName' : givenName.encode('utf-8'), 'mail' : mail.encode('utf-8'), 'fedoraPersonKeyId' : '', - 'fedoraPersonCertSerial' : -1, + 'fedoraPersonCertSerial' : '-1', 'description' : '', 'fedoraPersonCreationDate' : str(now), 'telephoneNumber' : telephoneNumber.encode('utf-8'), diff --git a/fas/ldap/52fc-fedora-person.ldif b/fas/ldap/52fc-fedora-person.ldif index 2852528..bc552a7 100644 --- a/fas/ldap/52fc-fedora-person.ldif +++ b/fas/ldap/52fc-fedora-person.ldif @@ -11,7 +11,10 @@ attributetypes: ( 2.5.444.17 NAME 'fedoraPersonCreationDate' DESC 'date entry wa attributeTypes: ( 2.5.444.18 NAME 'fedoraPersonApprovalStatus' DESC 'users approval status' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} ) attributeTypes: ( 2.5.444.19 NAME 'fedoraPersonKeyId' DESC 'users GPG key ID' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} ) attributeTypes: ( 2.5.444.22 NAME 'fedoraPersonCertSerial' DESC 'users SSL cert serial' EQUALITY IntegerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributeTypes: ( 2.5.444.23 NAME 'fedoraPersonTimeZone' DESC 'time zone of the user' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{100} ) +attributeTypes: ( 2.5.444.23 NAME 'fedoraPersonTimeZone' DESC 'time zone of the user' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} ) +attributeTypes: ( 2.5.444.24 NAME 'fedoraPersonEmailConfirm' DESC 'user email confirmation' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} ) +attributeTypes: ( 2.5.444.25 NAME 'fedoraPersonEmailCode' DESC 'user email code' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} ) + # fedoraPerson # The fedoraPerson represents people who are a member of the fedora project # in some way. It is a structural class and inherits