summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-07-27 16:28:03 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-07-27 16:28:03 +0200
commit082464b7e59451a2c993a9851de117c979cc24af (patch)
tree192a79505b2c25c411bca50ba239c832557b01ff /conf
parent063eb95d66064f8092a5ad918842e33cba9b8f36 (diff)
parent524849338fcb0cb40bcdb18f4dbe7e9660074f20 (diff)
downloadpykolab-082464b7e59451a2c993a9851de117c979cc24af.tar.gz
Merge branch 'master' of ssh://git.kolabsys.com/git/pykolab
Diffstat (limited to 'conf')
-rw-r--r--conf/kolab.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/conf/kolab.conf b/conf/kolab.conf
index d9a6a5a..128f0b8 100644
--- a/conf/kolab.conf
+++ b/conf/kolab.conf
@@ -365,10 +365,13 @@ admin_password = Welcome123
result_attribute = mail
[wallace]
-modules = resources, footer
+modules = resources, invitationpolicy, footer
footer_text = /etc/kolab/footer.text
footer_html = /etc/kolab/footer.html
+; default settings for kolabInvitationPolicy
+kolab_invitation_policy = ACT_ACCEPT_IF_NO_CONFLICT:example.org, ACT_MANUAL
+
; This is a domain name space specific section, that enables us to override
; all settings, for example, the LDAP URI, base and bind DNs, scopes, filters,
; etc. Note that overriding the LDAP settings for the primary domain name space