From c29fec1ca2c2aa4c6666d91358b078d848050106 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 20 Feb 2013 13:45:38 +0100 Subject: [PATCH 1/4] whitspaces --- admin_manual/auth_ldap.rst | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/admin_manual/auth_ldap.rst b/admin_manual/auth_ldap.rst index d1288d73e..ad916a48c 100644 --- a/admin_manual/auth_ldap.rst +++ b/admin_manual/auth_ldap.rst @@ -35,7 +35,7 @@ Settings Details Host: The host name of the LDAP server. It can also be a ``ldaps://`` URI, for - instance. + instance. * *Example: directory.my-company.com* @@ -60,7 +60,7 @@ Password: User Login Filter: The filter to use when a users tries to login. Use ``%uid`` as placeholder for the user name. Note, that login applies this filter only, but not User - List Filter. This may change in future. + List Filter. This may change in future. * Example (allows login with user name and email address): ``(|(uid=%uid)(email=$uid))`` @@ -116,7 +116,7 @@ Use TLS: * Example: [ ] -Case insensitive LDAP server (Windows): +Case insensitive LDAP server (Windows): Wether the LDAP server is running on a Windows Host * Example: [ ] @@ -127,9 +127,9 @@ Turn off SSL certificate validation: * Example: [ ] -User Display Name Field: +User Display Name Field: The attribute that should be used as ownCloud user name. ownCloud allows - a limited set of characters ``(a-zA-Z0-9.-_@)``, every other character + a limited set of characters ``(a-zA-Z0-9.-_@)``, every other character will be replaced in ownCloud. Once a user name is assigned, it will not be changed, i.e. changing this value will only have effect to new LDAP users. The default, uid, does not exist in AD, switch to ``cn``, for example, @@ -137,24 +137,24 @@ User Display Name Field: * Example: displayName -Group Display Name Field: +Group Display Name Field: The attribute that should be used as ownCloud group name. ownCloud allows a limited set of characters (a-zA-Z0-9.-_@), every other character will be replaced in ownCloud. Once a group name is assigned, it will not be changed, i.e. changing this value will only have effect to new LDAP groups. - * Example: ``cn`` + * Example: ``cn`` -Quota Attribute: +Quota Attribute: ownCloud can read an LDAP attribute and set the user quota there from. Specify the attribute here, otherwise keep it empty. * Example: ownCloudQuota * formerly Quota Field in ownCloud 4.0 -Quota Default: - Override ownCloud default quota for LDAP users who do not - have a quota set in the attribute given above. +Quota Default: + Override ownCloud default quota for LDAP users who do not + have a quota set in the attribute given above. * Example: 15 GB @@ -169,7 +169,7 @@ Cache Time-To-Live: for example lookups check whether the users exists on every page request or WebDAV interaction. It is also supposed to speed up the Admin → User page or list of users to share with, once it is populated. Changing this setting - empties the Cache. The time is given in seconds. + empties the Cache. The time is given in seconds. * Example (10 min): 600 @@ -181,7 +181,7 @@ User Home Folder Naming Rule: i.e. changing this value will only have effect to new LDAP users. Leave it empty to default behaviour - * Example: cn + * Example: cn Microsoft Active Directory -------------------------- @@ -212,7 +212,7 @@ inconvenience. .. figure:: images/ldap-settings-valid-oc45.png - Success + Success In this case, Save the settings. You can check if the users and groups are fetched correctly on the Settings → Users page. From 452512fe719c68816f2175d7a92054fc99a27d53 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 20 Feb 2013 13:46:14 +0100 Subject: [PATCH 2/4] LDAP: mention AD in basic intro --- admin_manual/auth_ldap.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin_manual/auth_ldap.rst b/admin_manual/auth_ldap.rst index ad916a48c..f069a89c5 100644 --- a/admin_manual/auth_ldap.rst +++ b/admin_manual/auth_ldap.rst @@ -17,10 +17,10 @@ Settings→Admin. Read on for a detailed description of the configuration fields Basic Settings -------------- -The basic settings are all you need. However, if you have a larger directory or -custom requirements you want to have a look on the advanced settings -afterwards. The basic part allows you to set up a working connection to your -LDAP server and use it with ownCloud. +The basic settings are all you need. However, if you have a larger directory, +custom requirements or need to connect to Active Directory (AD) you want to have +a look on the advanced settings afterwards. The basic part allows you to set up +a working connection to your LDAP server and use it with ownCloud. .. figure:: images/ldap-basic-settings-oc451.png From e8d83a13a02a6a278d753596e4f1fb839be0df81 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 20 Feb 2013 14:20:58 +0100 Subject: [PATCH 3/4] LDAP: update Advanced - User Home Folder Naming Rule --- admin_manual/auth_ldap.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/admin_manual/auth_ldap.rst b/admin_manual/auth_ldap.rst index f069a89c5..33c3ef1a3 100644 --- a/admin_manual/auth_ldap.rst +++ b/admin_manual/auth_ldap.rst @@ -177,9 +177,8 @@ User Home Folder Naming Rule: By default, the ownCloud creates the user directory, where all files and meta data are kept, according to the ownCloud user name. You may want to override this setting and name it after an - attribute’s value. Once set for a user, the user name folder will not change, - i.e. changing this value will only have effect to new LDAP users. Leave it - empty to default behaviour + attribute’s value. The attribute given can also return an absolute path, e.g. + ``/mnt/storage43/alice`` . Leave it empty for default behaviour. * Example: cn From 7e89064f8eb20cd4daaabe9f3a85c435596d8f00 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 20 Feb 2013 14:25:48 +0100 Subject: [PATCH 4/4] LDAP: fix AD part --- admin_manual/auth_ldap.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin_manual/auth_ldap.rst b/admin_manual/auth_ldap.rst index 33c3ef1a3..d90baf6b6 100644 --- a/admin_manual/auth_ldap.rst +++ b/admin_manual/auth_ldap.rst @@ -188,8 +188,8 @@ Microsoft Active Directory In case you want to connect to a Windows AD, you must change some values in the Advanced tab. * The default in User Display Name Field will not work with Active Directory. -* The Group Member association must be set to “member (AD)” Check Case insensitive -* LDAP server (Windows) +* The Group Member association must be set to “member (AD)” +* Check Case insensitive LDAP server (Windows) Testing the configuration -------------------------