3 commits - ucs/debian ucs/kolab-ucs-join-script.sh ucs/kolab-ucs-syntax-classes.py
Christoph Wickert
wickert at kolabsys.com
Tue Sep 29 16:24:29 CEST 2015
ucs/debian/kolab-ucs.install | 1
ucs/kolab-ucs-join-script.sh | 47 ++++++++++++++++++++++++++++++++--------
ucs/kolab-ucs-syntax-classes.py | 31 ++++++++++++++++++++++++++
3 files changed, 70 insertions(+), 9 deletions(-)
New commits:
commit 29ffd36b77838d7fd0a96eef8b9c8862f97671c7
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Sep 29 16:23:45 2015 +0200
kolab-ucs: Remove another reference to defaultUniventionMailHomeServer from joinscript (#4949)
diff --git a/ucs/kolab-ucs-join-script.sh b/ucs/kolab-ucs-join-script.sh
index 25b7ee6..69eacc3 100755
--- a/ucs/kolab-ucs-join-script.sh
+++ b/ucs/kolab-ucs-join-script.sh
@@ -61,12 +61,6 @@ ucs_registerLDAPExtension "$@" \
--udm_hook /usr/share/kolab-ucs/hookKolabEnabled.py
--udm_syntax /usr/share/kolab-ucs/kolab-syntax-classes.py
-# If there is no default kolab home server ...
-kolab_home=$(udm settings/default list "$@"
- --filter='cn=default' 2>/dev/null \
- | grep -i defaultUniventionMailHomeServer \
- | sed -r 's/\s*defaultUniventionMailHomeServer: //')
-
if [ "${kolab_home}" = "None" -o -z "${kolab_home}" ]; then
echo -n "Setting default groupware server ... "
udm settings/default modify "$@" \
commit f7dc5f7da25b602784dce06c3c6c93083c5dfea3
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Sep 29 16:22:31 2015 +0200
kolab-ucs: Remove incorrect default value from KolabDelegate attribute (#5234)
diff --git a/ucs/kolab-ucs-join-script.sh b/ucs/kolab-ucs-join-script.sh
index 6092b59..25b7ee6 100755
--- a/ucs/kolab-ucs-join-script.sh
+++ b/ucs/kolab-ucs-join-script.sh
@@ -237,7 +237,6 @@ udm settings/extended_attribute create "$@" --ignore_exists \
--set fullWidth=0 \
--set doNotSearch=0 \
--set syntax=UserDN \
- --set default=1 \
--set mayChange=1 \
--set multivalue=1 \
--set notEditable=0 \
commit 2b337affe7ee2e4c10a59c0dd0eee193790e579a
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Sep 29 16:19:59 2015 +0200
kolab-ucs: Add invitation policies to UMC (#5248)
diff --git a/ucs/debian/kolab-ucs.install b/ucs/debian/kolab-ucs.install
index cc0ee82..50b817d 100644
--- a/ucs/debian/kolab-ucs.install
+++ b/ucs/debian/kolab-ucs.install
@@ -2,3 +2,4 @@
65kolab-ucs.uinst /usr/lib/univention-uninstall
univention-kolab3.acl /usr/share/doc/kolab-schema
hookKolabEnabled.py /usr/share/kolab-ucs
+kolab-syntax-classes.py /usr/share/kolab-ucs
diff --git a/ucs/kolab-ucs-join-script.sh b/ucs/kolab-ucs-join-script.sh
index f54a1ef..6092b59 100755
--- a/ucs/kolab-ucs-join-script.sh
+++ b/ucs/kolab-ucs-join-script.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION=5
+VERSION=6
# We should probably just use base.sh and ldap.sh, for now we just use all.sh
. /usr/share/univention-lib/all.sh
@@ -59,6 +59,7 @@ ucs_registerLDAPExtension "$@" \
--schema /usr/share/doc/kolab-schema/univention-kolab3-wrapper.schema \
--acl /usr/share/doc/kolab-schema/univention-kolab3.acl \
--udm_hook /usr/share/kolab-ucs/hookKolabEnabled.py
+ --udm_syntax /usr/share/kolab-ucs/kolab-syntax-classes.py
# If there is no default kolab home server ...
kolab_home=$(udm settings/default list "$@"
@@ -173,6 +174,41 @@ udm settings/extended_attribute create "$@" --ignore_exists \
--set disableUDMWeb=0 \
--position "cn=kolab,cn=custom attributes,cn=univention,${ldap_base}"
+# Invitation policies
+udm settings/extended_attribute create "$@" --ignore_exists \
+ --set objectClass="kolabInetOrgPerson" \
+ --set name="KolabInvitationPolicy" \
+ --set CLIName="KolabInvitationPolicy" \
+ --append module="users/user" \
+ --append module="users/self" \
+ --set groupPosition=1 \
+ --set tabName="Kolab Groupware" \
+ --append translationTabName='"de_CH" "Kolab Groupware"' \
+ --append translationTabName='"de_DE" "Kolab Groupware"' \
+ --set tabAdvanced=0 \
+ --set overwriteTab=0 \
+ --set tabPosition=1 \
+ --set groupName="Invitations" \
+ --append translationGroupName='"de_CH" "Einladungen"' \
+ --append translationGroupName='"de_DE" "Einladungen"' \
+ --set shortDescription="Invitation Policy" \
+ --append translationShortDescription='"de_CH" "Einladungsrichtlinie"' \
+ --append translationShortDescription='"de_DE" "Einladungsrichtlinie"' \
+ --set longDescription="Policy for handling invitations. Multiple policies can be combined, most accurate is applied." \
+ --append translationLongDescription='"de_CH" "Richtlinie zur Handhabung von Einladungen. Verschiedene Richtlinien können kombiniert werden, die zutreffendste wird angewandt."' \
+ --append translationLongDescription='"de_DE" "Richtlinie zur Handhabung von Einladungen. Verschiedene Richtlinien können kombiniert werden, die zutreffendste wird angewandt."' \
+ --set ldapMapping=kolabInvitationPolicy \
+ --set deleteObjectClass=0 \
+ --set valueRequired=0 \
+ --set fullWidth=0 \
+ --set doNotSearch=0 \
+ --set syntax=KolabInvitationPolicies \
+ --set mayChange=1 \
+ --set multivalue=1 \
+ --set notEditable=0 \
+ --set disableUDMWeb=0 \
+ --position "cn=kolab,cn=custom attributes,cn=univention,${ldap_base}"
+
# Delegation
udm settings/extended_attribute create "$@" --ignore_exists \
--set objectClass="kolabInetOrgPerson" \
@@ -180,7 +216,7 @@ udm settings/extended_attribute create "$@" --ignore_exists \
--set CLIName="KolabDelegate" \
--append module="users/user" \
--append module="users/self" \
- --set groupPosition=1 \
+ --set groupPosition=2 \
--set tabName="Kolab Groupware" \
--append translationTabName='"de_CH" "Kolab Groupware"' \
--append translationTabName='"de_DE" "Kolab Groupware"' \
diff --git a/ucs/kolab-ucs-syntax-classes.py b/ucs/kolab-ucs-syntax-classes.py
new file mode 100644
index 0000000..5cc7706
--- /dev/null
+++ b/ucs/kolab-ucs-syntax-classes.py
@@ -0,0 +1,31 @@
+class KolablInvitationPolicies(select):
+ choices = [
+ ('',''),
+ ('ALL_MANUAL', 'Manually handle all invitations'),
+ ('ALL_ACCEPT', 'Accept all invitations'),
+ ('ALL_REJECT', 'Reject all invitations'),
+ ('ALL_UPDATE', 'Update all invitations'),
+ ('ALL_UPDATE_AND_NOTIFY', 'Update all invitations and notify user'),
+ ('ALL_SAVE_TO_FOLDER', 'Save all invitations to folder'),
+ ('ALL_SAVE_AND_FORWARD', 'Save all invitations to folder and forward invitation'),
+ ('ALL_CANCEL_DELETE', 'Delete canceled invitations'),
+ ('ALL_CANCEL_DELETE_AND_NOTIFY', 'Delete canceled invitations and notify user'),
+ ('EVENT_MANUAL', 'Manually handle event invitations'),
+ ('EVENT_ACCEPT', 'Accept event invitations'),
+ ('EVENT_ACCEPT_IF_NO_CONFLICT', 'Accept event invitations if there is no conflict'),
+ ('EVENT_TENTATIVE', 'Accept event invitations tentatively'),
+ ('EVENT_TENTATIVE_IF_NO_CONFLICT', 'Accept event invitations tentatively if there is no conflict'),
+ ('EVENT_REJECT', 'Reject event invitations'),
+ ('EVENT_REJECT_IF_CONFLICT', 'Reject event invitations in case of a conflict'),
+ ('EVENT_SAVE_TO_FOLDER', 'Save events to folder'),
+ ('EVENT_SAVE_AND_FORWARD', 'Save events to folder and forward original invitation'),
+ ('TASK_MANUAL', 'Manually handle task invitations'),
+ ('TASK_ACCEPT', 'Accept task invitations '),
+ ('TASK_REJECT', 'Reject task invitations'),
+ ('TASK_UPDATE', 'Update task invitations'),
+ ('TASK_UPDATE_AND_NOTIFY', 'Update tasks and notify user'),
+ ('TASK_SAVE_TO_FOLDER', 'Save tasks invitations to folder'),
+ ('TASK_SAVE_AND_FORWARD', 'Save task invitations to folder and forward invitation'),
+ ('TASK_CANCEL_DELETE', 'Delete canceled tasks'),
+ ('TASK_CANCEL_DELETE_AND_NOTIFY', 'Delete canceled tasks and notify user'),
+ ]
More information about the commits
mailing list