1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header |
2 |
|
|
--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header 2006-10-23 22:27:49.000000000 -0500 |
3 |
|
|
+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header 2006-10-23 22:23:25.000000000 -0500 |
4 |
|
|
@@ -1,6 +1,6 @@ |
5 |
|
|
//100header |
6 |
|
|
/** |
7 |
|
|
- * $Horde: ingo/config/backends.php.dist,v 1.20.8.4 2006/02/02 22:57:31 jan Exp $ |
8 |
|
|
+ * $Horde: ingo/config/backends.php.dist,v 1.20.8.6 2006/10/09 15:52:48 jan Exp $ |
9 |
|
|
* |
10 |
|
|
* Ingo works purely on a preferred mechanism for server selection. There are |
11 |
|
|
* a number of properties that you can set for each backend: |
12 |
|
|
@@ -10,6 +10,7 @@ |
13 |
|
|
* 'null' -- No backend server |
14 |
|
|
* 'timsieved' -- Cyrus timsieved server |
15 |
|
|
* 'vfs' -- Use Horde VFS |
16 |
|
|
+ * 'ldap' -- LDAP server |
17 |
|
|
* |
18 |
|
|
* preferred: This is the field that is used to choose which server is |
19 |
|
|
* used. The value for this field may be a single string or an |
20 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/160sieve mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/160sieve |
21 |
|
|
--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/160sieve 2006-10-23 22:27:49.000000000 -0500 |
22 |
|
|
+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/160sieve 2006-10-23 22:25:28.000000000 -0500 |
23 |
|
|
@@ -9,6 +9,8 @@ |
24 |
|
|
// 'hostspec' => 'mail.example.com', |
25 |
|
|
// // Login type of the server |
26 |
|
|
// 'logintype' => 'PLAIN', |
27 |
|
|
+// // Enable/disable TLS encryption |
28 |
|
|
+// 'usetls' => true, |
29 |
|
|
// // Port number of the timsieved server |
30 |
|
|
// 'port' => 2000, |
31 |
|
|
// // Name of the sieve script |
32 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/180kolabsieve mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/180kolabsieve |
33 |
|
|
--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/180kolabsieve 2005-09-01 14:46:04.000000000 -0500 |
34 |
|
|
+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/180kolabsieve 2006-10-23 22:26:53.000000000 -0500 |
35 |
|
|
@@ -8,6 +8,7 @@ |
36 |
|
|
// 'params' => array( |
37 |
|
|
// 'hostspec' => $GLOBALS['conf']['kolab']['imap']['server'], |
38 |
|
|
// 'logintype' => 'PLAIN', |
39 |
|
|
+// 'usetls' => false, |
40 |
|
|
// 'port' => $GLOBALS['conf']['kolab']['imap']['sieveport'], |
41 |
|
|
// 'scriptname' => 'kmail-vacation.siv' |
42 |
|
|
// ), |