From 6ea8ec0514fdf4d237651914b5189d5cfedafc42 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Fri, 12 Sep 2014 20:58:47 +0200 Subject: Add a keyring and alternative contact to the LDAP DIT. --- .../common-LDAP/files/etc/ldap/schema/fripost.ldif | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'roles/common-LDAP') diff --git a/roles/common-LDAP/files/etc/ldap/schema/fripost.ldif b/roles/common-LDAP/files/etc/ldap/schema/fripost.ldif index 0475d20..037c9ae 100644 --- a/roles/common-LDAP/files/etc/ldap/schema/fripost.ldif +++ b/roles/common-LDAP/files/etc/ldap/schema/fripost.ldif @@ -96,12 +96,12 @@ olcAttributeTypes: ( 1.3.6.1.4.1.40011.1.2.1.5 NAME 'fripostIsStatusActive' olcAttributeTypes: ( 1.3.6.1.4.1.40011.1.2.1.6 NAME 'fripostPendingToken' DESC 'Is the entry pending?' EQUALITY caseExactMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{64} SINGLE-VALUE ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{64} SINGLE-VALUE ) # olcAttributeTypes: ( 1.3.6.1.4.1.40011.1.2.1.7 NAME 'fripostUserQuota' - DESC 'The quota on a user e.g., "50MB"' - EQUALITY caseExactMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32} SINGLE-VALUE ) + DESC 'The quota on a user account, in bytes' + EQUALITY numericStringMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 SINGLE-VALUE ) # olcAttributeTypes: ( 1.3.6.1.4.1.40011.1.2.1.8 NAME 'fripostCanAddDomain' DESC 'A user/domain allowed to add domains' @@ -127,13 +127,23 @@ olcAttributeTypes: ( 1.3.6.1.4.1.40011.1.2.1.13 NAME 'fripostListManager' DESC 'The list manager' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{64} SINGLE-VALUE ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{64} SINGLE-VALUE ) # olcAttributeTypes: ( 1.3.6.1.4.1.40011.1.2.1.14 NAME 'fripostUseContentFilter' DESC 'Does the user want to use the content filter?' EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE ) # +olcAttributeTypes: ( 1.3.6.1.4.1.40011.1.2.1.15 NAME 'fripostOpenPGPKeyring' + DESC 'User OpenPGP Keyring (RFC 4880)' + SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 SINGLE-VALUE ) +# +olcAttributeTypes: ( 1.3.6.1.4.1.40011.1.2.1.16 NAME 'fripostAlternativeAddress' + DESC 'A non-fripost email address' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) +# # # Objects: 1.3.6.1.4.1.40011.1.2 # @@ -161,7 +171,7 @@ olcObjectClasses: ( 1.3.6.1.4.1.40011.1.2.4 NAME 'FripostVirtualUser' SUP top STRUCTURAL DESC 'Virtual user' MUST ( fvl $ userPassword $ fripostIsStatusActive $ fripostUseContentFilter ) - MAY ( fripostUserQuota $ description) ) + MAY ( fripostUserQuota $ description $ fripostOpenPGPKeyring $ fripostAlternativeAddress) ) # olcObjectClasses: ( 1.3.6.1.4.1.40011.1.2.5 NAME 'FripostVirtualAlias' SUP top STRUCTURAL -- cgit v1.2.3