comparison docs/setup.rst @ 5412:2079e864ce51

spelling: use "email" consistently The common English spelling is "email", not "e-mail" (and was indeed also the most common, but not only, variant in the Kallithea UI). http://grammarist.com/style/e-mail-email/
author Søren Løvborg <sorenl@unity3d.com>
date Fri, 14 Aug 2015 17:07:49 +0200
parents faf943716616
children 22a3fa3c4254
comparison
equal deleted inserted replaced
5411:5cb3a07abbf4 5412:2079e864ce51
197 197
198 Attribute mappings 198 Attribute mappings
199 Login Attribute = uid 199 Login Attribute = uid
200 First Name Attribute = firstName 200 First Name Attribute = firstName
201 Last Name Attribute = lastName 201 Last Name Attribute = lastName
202 E-mail Attribute = mail 202 Email Attribute = mail
203 203
204 If your user groups are placed in an Organisation Unit (OU) structure, the Search Settings configuration differs:: 204 If your user groups are placed in an Organisation Unit (OU) structure, the Search Settings configuration differs::
205 205
206 Search settings 206 Search settings
207 Base DN = DC=host,DC=example,DC=org 207 Base DN = DC=host,DC=example,DC=org
362 362
363 Base DN = OU=SBSUsers,OU=Users,OU=MyBusiness,DC=v3sys,DC=local 363 Base DN = OU=SBSUsers,OU=Users,OU=MyBusiness,DC=v3sys,DC=local
364 Login Attribute = sAMAccountName 364 Login Attribute = sAMAccountName
365 First Name Attribute = givenName 365 First Name Attribute = givenName
366 Last Name Attribute = sn 366 Last Name Attribute = sn
367 E-mail Attribute = mail 367 Email Attribute = mail
368 368
369 All other LDAP settings will likely be site-specific and should be 369 All other LDAP settings will likely be site-specific and should be
370 appropriately configured. 370 appropriately configured.
371 371
372 372
507 507
508 Celery configuration 508 Celery configuration
509 -------------------- 509 --------------------
510 510
511 Kallithea can use the distributed task queue system Celery_ to run tasks like 511 Kallithea can use the distributed task queue system Celery_ to run tasks like
512 cloning repositories or sending mails. 512 cloning repositories or sending emails.
513 513
514 Kallithea will in most setups work perfectly fine out of the box (without 514 Kallithea will in most setups work perfectly fine out of the box (without
515 Celery), executing all tasks in the web server process. Some tasks can however 515 Celery), executing all tasks in the web server process. Some tasks can however
516 take some time to run and it can be better to run such tasks asynchronously in 516 take some time to run and it can be better to run such tasks asynchronously in
517 a separate process so the web server can focus on serving web requests. 517 a separate process so the web server can focus on serving web requests.