nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-29 18:26:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix typos in example config; Improve Active Directory example

Browse Source 
This fixes a few typos and trailing spaces and improves the AD
example:

- missing port leads to PHP warnings
- use more common and compatible field names for attribute mapping
- distinguishedName as bind user example
This commit is contained in:
Andreas Haerter 2024-01-16 13:09:34 +01:00 committed by Andrew Ruthven
parent 3d2e3d9f12
commit d53dad3363
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
config/example-config.php
View File

@ -333,7 +333,7 @@ $c->admin_email = 'calendar-admin@example.com';
* Hide bound collections from certain clients
*
* If you want to use iOS (which does not support delegation) in combination
* with other software which does supports degation, you can use this option
* with other software which do support delegation, you can use this option
* to tailor a working solution: bind all collections you want to see on iOS
* (emulation of delegation) and then hide these collections from other clients
* with real delegation support.
@ -510,13 +510,13 @@ $c->admin_email = 'calendar-admin@example.com';
// $c->enable_auto_schedule = false;
/**
* If true, then remote scheduling will be enabled. There is a possibility
* If true, then remote scheduling will be enabled. There is a possibility
* of receiving spam events in calendars if enabled, you will at least know
* what domain the spam came from as domain key signatures are required for
* events to be accepted.
* events to be accepted.
*
* You probably need to setup Domain Keys for your domain as well as the
* appropiate DNS SRV records.
* appropriate DNS SRV records.
*
* for example, if DAViCal is installed on cal.example.com you should have
* DNS SRV records like this:
@ -532,7 +532,7 @@ $c->admin_email = 'calendar-admin@example.com';
// $c->enable_scheduling = true;
/**
* Domain Key domain to use when signing outbound scheduling requests, this
* Domain Key domain to use when signing outbound scheduling requests, this
* is the domain with the public key in a TXT record as shown above.
*
* TODO: enable domain/signing by per user keys, patches welcome.
@ -551,11 +551,11 @@ $c->admin_email = 'calendar-admin@example.com';
// $c->scheduling_dkim_selector = 'cal';
/*
* Domain Key private key
* Domain Key private key
* Required if you want to enable outbound remote server scheduling
*
* Default: none
*/
*/
// $c->schedule_private_key = 'PRIVATE-KEY-BASE-64-DATA';
@ -716,21 +716,23 @@ $c->admin_email = 'calendar-admin@example.com';
/*
* Use the following LDAP example if you are using Active Directory
*
* You will need to change host, passDN and DOMAIN in bindDN
* You will need to change host, passDN and DOMAIN in bindDN
* and baseDNUsers.
*/
// $c->authenticate_hook['call'] = 'LDAP_check';
// $c->authenticate_hook['config'] = array(
// 'host' => 'ldap://ldap.example.net',
// 'bindDN' => 'auth@DOMAIN',
// 'port' => '389', // usually 636 for ldaps://
// 'bindDN' => 'CN=bind-user,CN=Users,dc=DOMAIN,dc=local',
// 'passDN' => 'secret',
// 'baseDNUsers' => 'dc=DOMAIN,dc=local',
// 'protocolVersion' => 3,
// 'optReferrals' => 0,
// 'networkTimeout' => 10,
// 'filterUsers' => '(&(objectcategory=person)(objectclass=user)(givenname=*))',
// 'mapping_field' => array("username" => "uid",
// "fullname" => "cn" ,
// 'mapping_field' => array(
// "username" => "sAMAccountName",
// "fullname" => "displayName" ,
// "email" => "mail"
// ),
// 'default_value' => array("date_format_type" => "E","locale" => "en_NZ"),
@ -772,7 +774,7 @@ $c->admin_email = 'calendar-admin@example.com';
*/
// $c->authenticate_hook = array(
// 'call' => 'IMAP_PAM_check',
// 'config' => array(
// 'config' => array(
// 'imap_url' => '{localhost:993/imap/ssl/novalidate-cert}',
// 'email_base' => 'example.com'
// )
@ -783,7 +785,7 @@ $c->admin_email = 'calendar-admin@example.com';
/****** Webserver does Auth *****/
/********************************/
/**
/**
* It is quite common that the webserver can do the authentication for you,
* and you just want DAViCal to trust the username that the webserver will pass
* through (in the REMOTE_USER or REDIRECT_REMOTE_USER environment variable).