summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Boddie <paul@boddie.org.uk>2014-08-15 12:35:02 (GMT)
committerPaul Boddie <paul@boddie.org.uk>2014-08-15 12:35:02 (GMT)
commit134b5b05e6415c7461025ef655ceb904c2354440 (patch)
treebd2c9908ba3e5f9a353dab097f616ca08e25f0ba
parentf812088bde74af6b0b8a1a79342551bf2c07220f (diff)
downloadpykolab-134b5b05e6415c7461025ef655ceb904c2354440.tar.gz
Added missing configuration file changes for new setup features.
-rw-r--r--conf/kolab.conf23
-rw-r--r--share/templates/roundcubemail/config.inc.php.tpl4
-rw-r--r--share/templates/roundcubemail/kolab_auth.inc.php.tpl2
-rw-r--r--share/templates/roundcubemail/password.inc.php.tpl2
4 files changed, 26 insertions, 5 deletions
diff --git a/conf/kolab.conf b/conf/kolab.conf
index 128f0b8..627b23f 100644
--- a/conf/kolab.conf
+++ b/conf/kolab.conf
@@ -11,7 +11,7 @@ primary_domain = example.org
auth_mechanism = ldap
; The IMAP backend to use - currently supported values include only
-; 'cyrus-imap'.
+; 'cyrus-imap', 'dovecot-imap' and 'remote-imap'.
imap_backend = cyrus-imap
; The default locale for this Kolab Groupware installation
@@ -206,6 +206,7 @@ kolab_group_filter = (|(objectclass=kolabgroupofuniquenames)(objectclass=kolabgr
; Same again
sharedfolder_base_dn = ou=Shared Folders,%(base_dn)s
sharedfolder_filter = (objectclass=kolabsharedfolder)
+sharedfolder_delivery_address_attribute = mail
; Same again. Resources live in a different OU structure or;
;
@@ -350,6 +351,12 @@ ssl_verify_host = false
;ssl_local_cert = /path/to/local/cert
;ssl_passphrase = MyPassword
+[imap]
+; The URI written here may be propagated to other sections during the setup
+; process so that Cyrus-specific code, for example, may use the cyrus-imap
+; definition.
+uri =
+
[cyrus-imap]
; The URI to use to connect to IMAP. Note that pykolab itself can detect whether
; or not Cyrus IMAP is deployed in a Murder topology, and should be able to
@@ -364,11 +371,25 @@ admin_password = Welcome123
; The user canonification result attribute.
result_attribute = mail
+[dovecot-imap]
+uri = imaps://localhost:993
+mail_uid = vmail
+mail_gid = vmail
+mail_location = mbox:/var/mail/vmail/%%u
+
[wallace]
modules = resources, invitationpolicy, footer
footer_text = /etc/kolab/footer.text
footer_html = /etc/kolab/footer.html
+[xmpp]
+bind_uri =
+bind_proxy_uri =
+
+[smtp]
+; This will normally be localhost.
+host =
+
; default settings for kolabInvitationPolicy
kolab_invitation_policy = ACT_ACCEPT_IF_NO_CONFLICT:example.org, ACT_MANUAL
diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index bf61c2f..da80933 100644
--- a/share/templates/roundcubemail/config.inc.php.tpl
+++ b/share/templates/roundcubemail/config.inc.php.tpl
@@ -10,7 +10,7 @@
\$config['mail_domain'] = '';
// IMAP Server Settings
- \$config['default_host'] = 'tls://localhost';
+ \$config['default_host'] = 'tls://$imap_host';
\$config['default_port'] = 143;
\$config['imap_delimiter'] = '/';
\$config['imap_force_lsub'] = true;
@@ -23,7 +23,7 @@
\$config['session_storage'] = 'db';
// SMTP Server Settings
- \$config['smtp_server'] = 'tls://localhost';
+ \$config['smtp_server'] = 'tls://$smtp_host';
\$config['smtp_port'] = 587;
\$config['smtp_user'] = '%u';
\$config['smtp_pass'] = '%p';
diff --git a/share/templates/roundcubemail/kolab_auth.inc.php.tpl b/share/templates/roundcubemail/kolab_auth.inc.php.tpl
index 8fad27a..02e7349 100644
--- a/share/templates/roundcubemail/kolab_auth.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab_auth.inc.php.tpl
@@ -4,7 +4,7 @@
// or complete addressbook definition array.
\$config['kolab_auth_addressbook'] = Array(
'name' => 'Kolab Auth',
- 'hosts' => Array('localhost'),
+ 'hosts' => Array('$ldap_host'),
'port' => 389,
'use_tls' => false,
'user_specific' => false,
diff --git a/share/templates/roundcubemail/password.inc.php.tpl b/share/templates/roundcubemail/password.inc.php.tpl
index ca3f815..063156c 100644
--- a/share/templates/roundcubemail/password.inc.php.tpl
+++ b/share/templates/roundcubemail/password.inc.php.tpl
@@ -28,7 +28,7 @@
// You can provide one or several hosts in an array in which case the hosts are tried from left to right.
// Exemple: array('ldap1.exemple.com', 'ldap2.exemple.com');
// Default: 'localhost'
- \$config['password_ldap_host'] = 'localhost';
+ \$config['password_ldap_host'] = '$ldap_host';
// LDAP server port to connect to
// Default: '389'