Skip to content

Commit

Permalink
[mms] Add more advanced configuration options for the Redis HashTable…
Browse files Browse the repository at this point in the history
… driver (Michael Cramer <michael@bigmichi1.de>).
  • Loading branch information
slusarz committed Apr 2, 2014
1 parent 1ed37c2 commit 024f11c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
18 changes: 9 additions & 9 deletions horde/config/conf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2064,26 +2064,26 @@
</case>
<case name="Predis" desc="Redis Server">
<configsection name="params">
<configswitch name="protocol" desc="What protocol will we use to connect
to the redis server">tcp
<configswitch name="protocol" desc="Protocol used to connect to the
Redis server?">tcp
<case name="unix" desc="UNIX Sockets">
<configstring name="socket" required="true" desc="Location of UNIX
socket"/>
</case>
<case name="tcp" desc="TCP/IP">
<configlist name="hostspec" required="false" desc="What hostname(s) is
the redis server(s) running on, or what is the name of the system
DSN(s)? Specify multiple servers by separating with
<configlist name="hostspec" required="false" desc="Hostname(s) the
Redis server(s) are running on, or the name of the system DSN(s).
Specify multiple servers by separating with
commas.">localhost</configlist>
<configlist name="port" required="false" desc="Port(s) the redis
<configlist name="port" required="false" desc="Port(s) the Redis
server(s) are running on. If more than one host is used, specify ports
for respective servers, separated by commas.">6379</configlist>
</case>
</configswitch>
<configstring name="password" required="false" desc="What password do we
authenticate to the redis server with?"/>
<configstring name="password" required="false" desc="Password to
authenticate to the Redis server with."/>
<configboolean name="persistent" required="false" desc="Enable
persistent connections to server(s).">false</configboolean>
persistent connections to Redis server(s)?">false</configboolean>
</configsection>
</case>
</configswitch>
Expand Down
2 changes: 2 additions & 0 deletions horde/docs/CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
v5.2.0-git
----------

[mms] Add more advanced configuration options for the Redis HashTable driver
(Michael Cramer <michael@bigmichi1.de>).
[jan] Add script to import user preferences from Open-Xchange.
[mms] The location of dynamically served static files is now configurable
(Request #13070).
Expand Down
4 changes: 4 additions & 0 deletions horde/docs/UPGRADING
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ to the ActiveSync configuration section for more details.
The History driver can now be explicitly defined in the configuration (and a
new NoSQL driver has been added).

Additional options are now available for the Predis HashTable driver:
'password', 'persistent', and 'protocol'. Additionally, the 'hostspec' and
'port' options now accept multiple values (separated by commas).

The following options were added::

$conf['activesync']['logging']['level']
Expand Down
1 change: 1 addition & 0 deletions horde/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
</stability>
<license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
<notes>
* [mms] Add more advanced configuration options for the Redis HashTable driver (Michael Cramer &lt;michael@bigmichi1.de&gt;).
* [jan] Add script to import user preferences from Open-Xchange.
* [mms] The location of dynamically served static files is now configurable (Request #13070).
* [jan] Update Korean translation (Deokgon Kim &lt;dgkim@dgkim.net&gt;.
Expand Down

0 comments on commit 024f11c

Please sign in to comment.