Branch 'dev/boddie-new/combined' - 4 commits - conf/kolab.conf share/templates

Paul Boddie boddie at kolabsys.com
Fri Aug 15 14:47:55 CEST 2014


 conf/kolab.conf                                      |   23 ++++++++++++++++++-
 share/templates/converse-proxy.tpl                   |    6 ++++
 share/templates/master.cf.tpl                        |    2 -
 share/templates/roundcubemail/config.inc.php.tpl     |    4 +--
 share/templates/roundcubemail/kolab_auth.inc.php.tpl |    2 -
 share/templates/roundcubemail/password.inc.php.tpl   |    2 -
 6 files changed, 33 insertions(+), 6 deletions(-)

New commits:
commit 73f44a1e823eb897b9e68de776ef7cb542b38682
Merge: 21a80a7 9f35ddd
Author: Paul Boddie <paul at boddie.org.uk>
Date:   Fri Aug 15 14:37:16 2014 +0200

    Merge branch 'dev/boddie-new/setup' into dev/boddie-new/combined



commit 21a80a7b2a0b754a11c7f4c2a88bf17914246dc8
Author: Paul Boddie <paul at boddie.org.uk>
Date:   Fri Aug 15 14:37:01 2014 +0200

    Added Wallace to the mail routing.

diff --git a/share/templates/master.cf.tpl b/share/templates/master.cf.tpl
index 18aeea5..114dca1 100644
--- a/share/templates/master.cf.tpl
+++ b/share/templates/master.cf.tpl
@@ -72,7 +72,7 @@ smtp-amavis         unix        -       -       n       -       3       smtp
 # Listener to re-inject email from Amavisd into Postfix
 127.0.0.1:10025     inet        n       -       n       -       100     smtpd
     -o cleanup_service_name=cleanup_internal
-    -o content_filter=
+    -o content_filter=smtp-wallace:[127.0.0.1]:10026
     -o local_recipient_maps=
     -o relay_recipient_maps=
     -o smtpd_restriction_classes=


commit 9f35ddd08449b590275094b74861fedabe787351
Author: Paul Boddie <paul at boddie.org.uk>
Date:   Fri Aug 15 14:36:12 2014 +0200

    Added missing Converse proxy configuration file.

diff --git a/share/templates/converse-proxy.tpl b/share/templates/converse-proxy.tpl
new file mode 100644
index 0000000..8cc2858
--- /dev/null
+++ b/share/templates/converse-proxy.tpl
@@ -0,0 +1,6 @@
+<VirtualHost $bind_proxy_host_and_port>
+        RewriteEngine   on
+	# NOTE: Would be nice to restrict access.
+        #RewriteCond     %{REMOTE_ADDR} ^127.0.0.1
+        RewriteRule     ^/http-bind(.*) $bind_uri\$1 [P,L]
+</VirtualHost>


commit 134b5b05e6415c7461025ef655ceb904c2354440
Author: Paul Boddie <paul at boddie.org.uk>
Date:   Fri Aug 15 14:35:02 2014 +0200

    Added missing configuration file changes for new setup features.

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'




More information about the commits mailing list