diff --git a/config/example-config.php b/config/example-config.php index 4e85dd35..ace96dd7 100644 --- a/config/example-config.php +++ b/config/example-config.php @@ -31,9 +31,9 @@ $c->pg_connect[] = "dbname=davical user=davical_app"; // $c->system_name = "DAViCal CalDAV Server"; /** -* The CalDAV specification does not define GET on a collection, but typically this is -* used as a .ics download for the whole collection. This will also enable a download -* link in the web interface for calendars with entries. +* The CalDAV specification does not define GET on a collection, but typically +* this is used as a .ics download for the whole collection. This will also +* enable a download link in the web interface for calendars with entries. * * Default: false */ @@ -44,9 +44,9 @@ $c->pg_connect[] = "dbname=davical user=davical_app"; * will be read-only. Any changes to them must be applied via CalDAV. * * You may want to set this to false during your initial setup to make it -* easier for people to PUT whole calendars or addressbooks as part of migrating -* their data. After this, it is recommended to turn it off so that clients -* which have been misconfigured are readily identifiable. +* easier for people to PUT whole calendars or addressbooks as part of +* migrating their data. After this, it is recommended to turn it off so that +* clients which have been misconfigured are readily identifiable. * * Default: true */ @@ -99,9 +99,10 @@ $c->admin_email = 'calendar-admin@example.com'; /** * Restrict access to the administrative pages to only be available on a * particular domain name and port. The default is that any DAViCal instance -* will have the administrative pages active. When any these settings is enabled, -* requests for administrative URLs such as index.php, admin.php, setup.php etc -* will be redirected to 'caldav.php', unless the restrictions are fulfilled. +* will have the administrative pages active. When any these settings is +* enabled, requests for administrative URLs such as index.php, admin.php, +* setup.php etc will be redirected to 'caldav.php', unless the restrictions +* are fulfilled. */ // $c->restrict_admin_domain = 'admin.davical.example.com'; // $c->restrict_admin_port = '8443'; @@ -131,8 +132,8 @@ $c->admin_email = 'calendar-admin@example.com'; * Allow users to see all accounts on the server in the web interface, or only * their account and the accounts they have a relationship with. If set to * false, users need the READ privilege to display another principal and their -* collections, and they need to be in the same group with another principal to -* find them in a drop-down list for granting privileges. +* collections, and they need to be in the same group with another principal +* to find them in a drop-down list for granting privileges. * * Admins will still be able to see all accounts. * @@ -142,17 +143,20 @@ $c->admin_email = 'calendar-admin@example.com'; /** * Provide a way of over-riding the default password change UI to render a -* clickable link instead. Usually the UI provides a pair of text boxes to enter -* a new password and confirm password. In some cases where remote authentication -* is being used, the password change process is managed in a more complex way -* and allowing it to be changed locally is not helpful. In this case the UI -* is disabled and an HREF displayed to take the user to the appropriate place for -* facilitating that. +* clickable link instead. Usually the UI provides a pair of text boxes to +* enter a new password and confirm password. In some cases where remote +* authentication is being used, the password change process is managed in a +* more complex way and allowing it to be changed locally is not helpful. In +* this case the UI is disabled and an HREF displayed to take the user to the +& appropriate place for facilitating that. * -* As well as the Administration UI, this will also affect the Forgotten Password -* UI since it would create a temporary local password. The login HTML rendered by -* libawl-php is over-ridden and replaced by the same HREF as above. -* Users with Administrator privileges will still see the default password change UI. +* As well as the Administration UI, this will also affect the Forgotten +* Password UI since it would create a temporary local password. The login +* HTML rendered by libawl-php is over-ridden and replaced by the same HREF as +* above. +* +* Users with Administrator privileges will still see the default password +* change UI. * * Default: unset */ @@ -168,10 +172,10 @@ $c->admin_email = 'calendar-admin@example.com'; ***************************************************************************/ /** -* Whenever you think you've found an issue with how DAViCal handles a situation, -* generating some data on what it's actually doing and whether it can find a -* certain event in the database etc. can be essential to allow others (or -* yourself) to understand what's going wrong. +* Whenever you think you've found an issue with how DAViCal handles a +* situation, generating some data on what it's actually doing and whether it +* can find a certain event in the database etc. can be essential to allow +* others (or yourself) to understand what's going wrong. * * There are many different types of debug messages (for more details see * debug-config.php), but this will log them all: @@ -179,10 +183,10 @@ $c->admin_email = 'calendar-admin@example.com'; // $c->dbg["ALL"] = 1; /** -* While the above setting will quickly fill your PHP error log and should best -* be restricted to one or two requests, logging just the client interaction -* is almost as useful. This should be the minimum for any support request on -* the mailing list or issue tracker. +* While the above setting will quickly fill your PHP error log and should +* best be restricted to one or two requests, logging just the client +* interaction is almost as useful. This should be the minimum for any support +* request on the mailing list or issue tracker. */ // $c->dbg["request"] = 1; // The request headers & content // $c->dbg['response'] = 1; // The response headers & content @@ -229,25 +233,29 @@ $c->admin_email = 'calendar-admin@example.com'; // $c->home_addressbook_name = 'addresses'; /** -* Sets a numeric value indicating the maximum size in octets (bytes) of a resource -* that the server is willing to accept when an address object resource is stored -* in an address book collection (e.g. contacts with image attachments). -* Note that not all clients respect that property and that DAViCal won't deny creating -* or updating a resource that is larger than the specified limit if the client willingly or -* unwillingly ignores that property. Currently (late 2018) we only know of iOS devices to handle it properly. +* Sets a numeric value indicating the maximum size in octets (bytes) of a +* resource that the server is willing to accept when an address object +* resource is stored in an address book collection (e.g. contacts with image +* attachments). +* +* Note that not all clients respect that property and that DAViCal won't deny +* creating or updating a resource that is larger than the specified limit if +* the client willingly or unwillingly ignores that property. Currently (late +* 2018) we only know of iOS devices to handle it properly. * * Default: 6550000 */ // $c->carddav_max_resource_size = 6550000; /** -* If the above options are not suitable for your new users, use this to create -* a more complex default collection management. +* If the above options are not suitable for your new users, use this to +* create a more complex default collection management. * * Note: if you use this configuration option both $c->home_calendar_name and * $c->home_addressbook_name are ignored! * -* See https://wiki.davical.org/index.php/Configuration/settings/default_collections +* See: +* https://wiki.davical.org/index.php/Configuration/settings/default_collections */ // $c->default_collections = array( // array( @@ -280,10 +288,11 @@ $c->admin_email = 'calendar-admin@example.com'; /** * An array of the privileges which will be configured for a user by default * from the possible set of real privileges: -* 'read', 'write-properties', 'write-content', 'unlock', 'read-acl', 'read-current-user-privilege-set', -* 'bind', 'unbind', 'write-acl', 'read-free-busy', -* 'schedule-deliver-invite', 'schedule-deliver-reply', 'schedule-query-freebusy', -* 'schedule-send-invite', 'schedule-send-reply', 'schedule-send-freebusy' +* 'read', 'write-properties', 'write-content', 'unlock', 'read-acl', +* 'read-current-user-privilege-set', 'bind', 'unbind', 'write-acl', +* 'read-free-busy', 'schedule-deliver-invite', 'schedule-deliver-reply', +* 'schedule-query-freebusy', 'schedule-send-invite', 'schedule-send-reply', +* 'schedule-send-freebusy' * * Or also from these aggregated privileges: * 'write', 'schedule-deliver', 'schedule-send', 'all' @@ -335,8 +344,8 @@ $c->admin_email = 'calendar-admin@example.com'; * If you want to use iOS (which does not support delegation) in combination * 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. +* (emulation of delegation) and then hide these collections from other +* clients with real delegation support. * * Default: false/not set: always show bound collections * @@ -365,9 +374,10 @@ $c->admin_email = 'calendar-admin@example.com'; /** * If you want to force DAViCal to use HTTP Digest Authentication for CalDAV -* access. Note that this requires all user passwords to be stored in plain text -* in the database. It is probably better to configure the webserver to do -* Digest auth against a separate user database (see below for Webserver Auth). +* access. Note that this requires all user passwords to be stored in plain +* text in the database. It is probably better to configure the webserver to +* do Digest auth against a separate user database (see below for Webserver +* Auth). */ // $c->http_auth_mode = "Digest"; @@ -382,10 +392,10 @@ $c->admin_email = 'calendar-admin@example.com'; /** * The "support_obsolete_free_busy_property" value controls whether, -* during a PROPFIND, the obsolete Scheduling property "calendar-free-busy-set" -* is returned. Set the value to true to support the property only if your -* client requires it, however note that PROPFIND performance may be -* adversely affected if you do so. +* during a PROPFIND, the obsolete Scheduling property +* "calendar-free-busy-set" is returned. Set the value to true to support the +* property only if your client requires it, however note that PROPFIND +* performance may be adversely affected if you do so. * * Introduced in DAViCal version 1.1.4 in support of Issue #31 Database * Performance Improvements. @@ -400,14 +410,15 @@ $c->admin_email = 'calendar-admin@example.com'; * If you are in a non-English locale, you can set the default_locale * configuration to one of the supported locales. * -* Supported Locales (at present, see: "select * from supported_locales ;" for a full list) +* Supported Locales (at present, see: "select * from supported_locales ;" for +* a full list): * -* "de_DE", "en_NZ", "es_AR", "fr_FR", "nl_NL", "ru_RU" +* "de_DE", "en_NZ", "es_AR", "fr_FR", "nl_NL", "ru_RU" * -* If you want locale support you probably know more about configuring it than me, but -* at this stage it should be noted that all translations are UTF-8, and pages are -* served as UTF-8, so you will need to ensure that the UTF-8 versions of these locales -* are supported on your system. +* If you want locale support you probably know more about configuring it than +* me, but at this stage it should be noted that all translations are UTF-8, +* and pages are served as UTF-8, so you will need to ensure that the UTF-8 +* versions of these locales are supported on your system. * * People interested in providing new translations are directed to the Wiki: * https://wiki.davical.org/w/Translating_DAViCal @@ -415,9 +426,10 @@ $c->admin_email = 'calendar-admin@example.com'; // $c->default_locale = "en_NZ"; /** -* This is used to construct URLs which are passed in the answers to the client. You may -* want to force this to a specific domain in responses if your system is accessed by -* multiple names, otherwise you probably won't need to change it. +* This is used to construct URLs which are passed in the answers to the +* client. You may want to force this to a specific domain in responses if +* your system is accessed by multiple names, otherwise you probably won't +* need to change it. * * Default: $_SERVER['SERVER_NAME'] */ @@ -443,8 +455,8 @@ $c->admin_email = 'calendar-admin@example.com'; * an attendee of a meeting and then would be able to read the meeting. * * Without this, the only person who can view/change PRIVATE or CONFIDENTIAL -* events in a calendar is someone with full administrative rights to the calendar -* usually the owner. +* events in a calendar is someone with full administrative rights to the +* calendar usually the owner. * * If the only person that devious is your sysadmin then you probably already * enabled this option... @@ -468,7 +480,10 @@ $c->admin_email = 'calendar-admin@example.com'; * If set to true: never show * If set to an array: hide if any header => regex tuple matches */ -// $c->disable_caldav_proxy_propfind_collections = array( 'User-Agent'=>'#regex1#', 'X-Client'=>'#regex2#'); +// $c->disable_caldav_proxy_propfind_collections = array( +// 'User-Agent' => '#regex1#', +// 'X-Client' => '#regex2#' +// ); /** * A limiter on how many times we'll apply the recurrence rules for an event @@ -478,7 +493,8 @@ $c->admin_email = 'calendar-admin@example.com'; * * If you see the following error message, you may want to consider increasing * it: -* RRULE, loop limit has been hit in GetMoreInstances, you probably want to increase $c->rrule_loop_limit +* RRULE, loop limit has been hit in GetMoreInstances, you probably want to +* increase $c->rrule_loop_limit */ // $c->rrule_loop_limit = 100; @@ -501,9 +517,9 @@ $c->admin_email = 'calendar-admin@example.com'; ***************************************************************************/ /** -* If you want to turn off scheduling functions you can set this to 'false' and -* DAViCal will not advertise the ability to schedule, leaving it to calendar -* clients to send out and receive scheduling requests. +* If you want to turn off scheduling functions you can set this to 'false' +* and DAViCal will not advertise the ability to schedule, leaving it to +* calendar clients to send out and receive scheduling requests. * * Default: true */ @@ -521,10 +537,9 @@ $c->admin_email = 'calendar-admin@example.com'; * for example, if DAViCal is installed on cal.example.com you should have * DNS SRV records like this: * _ischedules._tcp.example.com. IN SRV 0 1 443 cal.example.com -* _ischedule._tcp.example.com. IN SRV 0 1 80 cal.example.com +* _ischedule._tcp.example.com. IN SRV 0 1 80 cal.example.com * -* DNS TXT record for signing outbound requests -* example: +* DNS TXT record for signing outbound requests example: * cal._domainkey.example.com. 86400 IN TXT "k=rsa\; t=s\; p=PUBKEY" * * Default: false @@ -567,17 +582,17 @@ $c->admin_email = 'calendar-admin@example.com'; /** * If you install DAViCal behind a reverse proxy (e.g. an SSL offloader or -* application firewall, or in order to present services from different machines -* on a single public IP / hostname), the client IP, protocol and port used may -* be different from what the web server is reporting to DAViCal. Often, the -* original values are written to the X-Real-IP and/or X-Forwarded-For, -* X-Forwarded-Proto and X-Forwarded-Port headers. You can instruct DAViCal to -* attempt to "do the right thing" and use the content of these headers instead, -* when they are available. +* application firewall, or in order to present services from different +* machines on a single public IP / hostname), the client IP, protocol and +* port used may be different from what the web server is reporting to +* DAViCal. Often, the original values are written to the X-Real-IP and/or +* X-Forwarded-For, X-Forwarded-Proto and X-Forwarded-Port headers. You can +* instruct DAViCal to attempt to "do the right thing" and use the content of +* these headers instead, when they are available. * -* CAUTION: Malicious clients can spoof these headers. When you enable this, you -* need to make sure your reverse proxy erases any pre-existing values of all -* these headers, and that no untrusted requests can reach DAViCal without +* CAUTION: Malicious clients can spoof these headers. When you enable this, +* you need to make sure your reverse proxy erases any pre-existing values of +* all these headers, and that no untrusted requests can reach DAViCal without * passing the proxy server. * * Default: false @@ -607,27 +622,31 @@ $c->admin_email = 'calendar-admin@example.com'; ***************************************************************************/ /** -* Allow specifying another way to control access of the user by authenticating -* him against other drivers such has LDAP (the default is the PgSQL DB) -* $c->authenticate_hook['call'] should be set to the name of the plugin and must -* be a valid function that will be call like this: +* Allow specifying another way to control access of the user by +* authenticating them against other drivers such as LDAP (the default is the +* PostgreSQL DB). +* +* $c->authenticate_hook['call'] should be set to the name of the plugin and +* must be a valid function that will be call like this: * call_user_func( $c->authenticate_hook['call'], $username, $password ) * * The login mechanism is used in 2 different places: -* - for the web interface in: index.php that calls DAViCalSession.php that extends -* Session.php (from AWL libraries) +* - for the web interface in: index.php that calls DAViCalSession.php that +* extends Session.php (from AWL libraries) * - for the caldav client in: caldav.php that calls HTTPAuthSession.php * Both Session.php and HTTPAuthSession.php check against the -* authenticate_hook['call'], although for HTTPAuthSession.php this will be for -* each page. For Session.php this will only occur during login. +* authenticate_hook['call'], although for HTTPAuthSession.php this will be +* for each page. For Session.php this will only occur during login. +* +* $c->authenticate_hook['config'] should be set up with any configuration +* data needed by the authenticate call - see below or in the Wiki for +* details. * -* $c->authenticate_hook['config'] should be set up with any configuration data -* needed by the authenticate call - see below or in the Wiki for details. * If you want to develop your own authentication plugin, have a look at * awl/inc/AuthPlugins.php or any of the inc/drivers_*.php files. * -* $c->authenticate_hook['optional'] = true; can be set to try default authentication -* as well in case the configured hook should report a failure. +* $c->authenticate_hook['optional'] = true; can be set to try default +* authentication as well in case the configured hook should report a failure. */ // $c->authenticate_hook['optional'] = true; @@ -638,7 +657,8 @@ $c->admin_email = 'calendar-admin@example.com'; // $c->authenticate_hook = array( // 'call' => 'AuthExternalAwl', // 'config' => array( -// // A PgSQL database connection string for the database containing user records +// // A PgSQL database connection string for the database +// // containing user records // 'connection' => 'dbname=wrms host=otherhost port=5433 user=general', // // Which columns should be fetched from the database // 'columns' => "user_no, active, email_ok, joined, last_update AS updated, last_used, username, password, fullname, email", @@ -657,44 +677,68 @@ $c->admin_email = 'calendar-admin@example.com'; // $c->authenticate_hook['call'] = 'LDAP_check'; // $c->authenticate_hook['config'] = array( -// /* Use URI to set one or more LDAP servers to connect to for redundancy. Also supports ldaps. +// /* Use URI to set one or more LDAP servers to connect to for +// * redundancy. Also supports ldaps. // * If no URI string is set, host and port can be used */ // 'uri' => 'ldaps://hostname:port ldap://hostname2:port2' -// 'host' => 'www.tennaxia.net', //host name of your LDAP Server -// 'port' => '389', //port +// 'host' => 'ldap.example.net', // host name of your LDAP Server +// 'port' => '389', // port /* For the initial bind to be anonymous leave bindDN and passDN - commented out */ + * commented out */ // DN and password if required to bind to this server for initial queries -// 'bindDN' => 'cn=manager,cn=internal,dc=tennaxia,dc=net', +// 'bindDN' => 'cn=manager,cn=internal,dc=example,dc=net', // 'passDN' => 'xxxxxxxx', -// 'protocolVersion' => '3', // Version of LDAP protocol to use -// 'optReferrals' => 0, // whether to automatically follow referrals returned by the LDAP server +// 'protocolVersion' => '3', // version of LDAP protocol to use +// 'optReferrals' => 0, // whether to automatically follow referrals +// // returned by the LDAP server // 'networkTimeout' => 10, // timeout in seconds -// 'baseDNUsers' => 'dc=tennaxia,dc=net', // where to look at valid user -// 'filterUsers' => 'objectClass=kolabInetOrgPerson', // filter which must validate a user according to RFC4515, i.e. surrounded by brackets -// 'baseDNGroups' => 'ou=divisions,dc=tennaxia,dc=net', // where to look for groups -// 'filterGroups' => 'objectClass=groupOfUniqueNames', // filter with same rules as filterUsers - /** /!\ "username" should be set and "modified" must be set **/ -// 'mapping_field' => array("username" => "uid", +// 'baseDNUsers' => 'dc=example,dc=net', // where to look at valid user + /* filter which must validate a user according to RFC4515, i.e. + * surrounded by brackets */ +// 'filterUsers' => 'objectClass=kolabInetOrgPerson', + /* where to look for groups */ +// 'baseDNGroups' => 'ou=divisions,dc=example,dc=net', + /* filter with same rules as filterUsers */ +// 'filterGroups' => 'objectClass=groupOfUniqueNames', + /* /!\ "username" should be set and "modified" must be set + * used to create the user based on their ldap properties */ +// 'mapping_field' => array( +// "username" => "uid", // "modified" => "modifyTimestamp", // "fullname" => "cn", // "email" => "mail" -// ), // used to create the user based on their ldap properties -// 'group_mapping_field' => array("username" => "cn", +// ), + /* used to create the group based on the ldap properties */ +// 'group_mapping_field' => array( +// "username" => "cn", // "modified" => "modifyTimestamp", // "fullname" => "cn", // "members" => "memberUid" -// ), // used to create the group based on the ldap properties -// 'group_member_dnfix' => true, // if your "members" field contains the full DN and needs to be truncated to just the uid +// ), - /** used to set default value for all users, will be overcharged by ldap if defined also in mapping_field **/ -// 'default_value' => array("date_format_type" => "E","locale" => "fr_FR"), + /* if your "members" field contains the full DN and needs to be + * truncated to just the uid */ +// 'group_member_dnfix' => true, + + /** used to set default value for all users, will be overcharged by + * ldap if defined also in mapping_field **/ +// 'default_value' => array( +// "date_format_type" => "E", +// "locale" => "fr_FR" +// ), /** foreach key set start and length in the string provided by ldap example for openLDAP timestamp : 20070503162215Z **/ -// 'format_updated' => array('Y' => array(0,4), 'm' => array(4,2), 'd' => array(6,2), 'H' => array(8,2), 'M' => array(10,2), 'S' => array(12,2)), +// 'format_updated' => array( +// 'Y' => array(0,4), +// 'm' => array(4,2), +// 'd' => array(6,2), +// 'H' => array(8,2), +// 'M' => array(10,2), +// 'S' => array(12,2) +// ), // 'startTLS' => 'yes', // Require that TLS is used for LDAP? // If ldap_start_tls is not working, it is probably @@ -707,7 +751,8 @@ $c->admin_email = 'calendar-admin@example.com'; // // ); // -// /* If there is some user/group you do not want to sync from LDAP, put their username in these lists */ +// /* If there is some user/group you do not want to sync from LDAP, put +// * their username in these lists */ // $c->do_not_sync_from_ldap = array( 'admin' => true ); // $c->do_not_sync_group_from_ldap = array( 'teamclient1' => true ); // @@ -736,11 +781,22 @@ $c->admin_email = 'calendar-admin@example.com'; // "email" => "mail", // "modified" => "" // ), -// 'default_value' => array("date_format_type" => "E","locale" => "en_NZ"), -// 'format_updated' => array('Y' => array(0,4), 'm' => array(4,2), 'd' => array(6,2), 'H' => array(8,2), 'M' => array(10,2), 'S' => array(12,2)) +// 'default_value' => array( +// "date_format_type" => "E", +// "locale" => "en_NZ" +// ), +// 'format_updated' => array( +// 'Y' => array(0,4), +// 'm' => array(4,2), +// 'd' => array(6,2), +// 'H' => array(8,2), +// 'M' => array(10,2), +// 'S' => array(12,2) +// ) // ); // -// /* If there is some user/group you do not want to sync from LDAP, put their username in these lists */ +// /* If there is some user/group you do not want to sync from LDAP, put +// * their username in these lists */ // $c->do_not_sync_from_ldap = array( 'admin' => true ); // $c->do_not_sync_group_from_ldap = array( 'teamclient1' => true ); // @@ -756,7 +812,10 @@ $c->admin_email = 'calendar-admin@example.com'; */ // $c->authenticate_hook = array( // 'call' => 'SQUID_PAM_check', -// 'config' => array( 'script' => '/usr/bin/pam_auth', 'email_base' => 'example.com' ) +// 'config' => array( +// 'script' => '/usr/bin/pam_auth', +// 'email_base' => 'example.com' +// ) // ); // include('drivers_squid_pam.php'); @@ -765,8 +824,10 @@ $c->admin_email = 'calendar-admin@example.com'; */ // $c->authenticate_hook = array( // 'call' => 'PWAUTH_PAM_check', -// 'config' => array('path' => '/usr/sbin/pwauth', -// 'email_base' => 'example.com') +// 'config' => array( +// 'path' => '/usr/sbin/pwauth', +// 'email_base' => 'example.com' +// ) // ); // include('drivers_pwauth_pam.php'); @@ -788,11 +849,11 @@ $c->admin_email = 'calendar-admin@example.com'; /** * 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). -* In that case, set server_auth_type (can be an array) to the value provided by -* the webserver in the AUTH_TYPE environment variable, as well as the two -* following options as needed. +* 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). In that case, set server_auth_type (can be an array) to the +* value provided by the webserver in the AUTH_TYPE environment variable, as +* well as the two following options as needed. * * Note that this method does not pull account details from anywhere, so you * will first need to create an account in DAViCal for each username that will @@ -833,11 +894,16 @@ $c->admin_email = 'calendar-admin@example.com'; */ // $c->notifications_server = array( -// 'host' => $_SERVER['SERVER_NAME'], // jabber server hostname -// 'jid' => 'user@example.com', // user(JID) to login/ publish as -// 'password' => '', // password for above account -// // 'debug_jid' => 'otheruser@example.com' // send a copy of all publishes to this jid +// /* jabber server hostname */ +// 'host' => $_SERVER['SERVER_NAME'], +// /* user(JID) to login/ publish as */ +// 'jid' => 'user@example.com', +// /* password for above account */ +// 'password' => '', +// /* send a copy of all publishes to this jid */ +// // 'debug_jid' => 'otheruser@example.com' // ); +// // include ( 'pubsub.php' ); @@ -856,11 +922,21 @@ $c->admin_email = 'calendar-admin@example.com'; * Note that there is currently no way of enabling metrics via memcache * without memcache being enabled for all of DAViCal. */ -// $c->metrics_style = 'counters'; // Just the simple counter-based metrics -// $c->metrics_style = 'memcache'; // Only the metrics using memcache -// $c->metrics_style = 'both'; // Both styles of metrics -// $c->metrics_collectors = array('127.0.0.1'); // Restrict access to only this IP address -// $c->metrics_require_user = 'metricsuser'; // Restrict access to only connections authenticating as this user + +/* Just the simple counter-based metrics */ +// $c->metrics_style = 'counters'; + +/* Only the metrics using memcache */ +// $c->metrics_style = 'memcache'; + +/* Both styles of metrics */ +// $c->metrics_style = 'both'; + +/* Restrict access to only this IP address */ +// $c->metrics_collectors = array('127.0.0.1'); + +/* Restrict access to only connections authenticating as this user */ +// $c->metrics_require_user = 'metricsuser'; /*************************************************************************** * * @@ -869,8 +945,8 @@ $c->admin_email = 'calendar-admin@example.com'; ***************************************************************************/ /* To enable audit logging to syslog you can uncomment the following line. * -* This file is suitable for basic auditing, if you want/need more comprehensive -* logging then see: +* This file is suitable for basic auditing, if you want/need more +* comprehensive logging then see: * http://wiki.davical.org/index.php/Configuration/hooks/log_caldav_action */ // include('log_caldav_action.php');