7 commits - ucs/kolab-ucs-join-script.sh ucs/kolab-ucs-syntax-classes.py ucs/kolab-ucs-unjoin-script.sh

Christoph Wickert wickert at kolabsys.com
Wed Sep 30 14:50:46 CEST 2015 

 ucs/kolab-ucs-join-script.sh    |   20 +++++++-------------
 ucs/kolab-ucs-syntax-classes.py |    2 +-
 ucs/kolab-ucs-unjoin-script.sh  |    5 ++++-
 3 files changed, 12 insertions(+), 15 deletions(-)

New commits:
commit 9a8e3ff618ce60a8e8e32c2c4344b214b01a75c3
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Sep 30 11:15:28 2015 +0200

    kolab-ucs: Fix typo in kolab syntax classes (#5248)

diff --git a/ucs/kolab-ucs-syntax-classes.py b/ucs/kolab-ucs-syntax-classes.py
index 5cc7706..e065ec3 100644
--- a/ucs/kolab-ucs-syntax-classes.py
+++ b/ucs/kolab-ucs-syntax-classes.py
@@ -1,4 +1,4 @@
-class KolablInvitationPolicies(select):
+class KolabInvitationPolicies(select):
 	choices = [
 		('',''),
 		('ALL_MANUAL', 'Manually handle all invitations'),


commit db7516fafb171d3f3b4505afbd9190a3f604beee
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Sep 29 18:37:22 2015 +0200

    kolab-ucs: Remove yet another reference to defaultUniventionMailHomeServer from joinscript (#4949)

diff --git a/ucs/kolab-ucs-join-script.sh b/ucs/kolab-ucs-join-script.sh
index aacccbe..a89fa7b 100755
--- a/ucs/kolab-ucs-join-script.sh
+++ b/ucs/kolab-ucs-join-script.sh
@@ -61,13 +61,6 @@ ucs_registerLDAPExtension "$@" \
 	--udm_hook /usr/share/kolab-ucs/hookKolabEnabled.py \
 	--udm_syntax /usr/share/kolab-ucs/kolab-syntax-classes.py
 
-if [ "${kolab_home}" = "None" -o -z "${kolab_home}" ]; then
-	echo -n "Setting default groupware server ... "
-	udm settings/default modify "$@" \
-		--dn cn=default,cn=univention,${ldap_base} \
-		--set defaultUniventionMailHomeServer="${hostname}.${domainname}"
-fi
-
 # Create Groupware account template
 echo -n "Creating Groupware Account template ... "
 udm settings/usertemplate create "$@" --ignore_exists \


commit aa73e202961ab21832dd565f09e4a11ac11ca866
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Sep 29 17:42:01 2015 +0200

    Fix label and position of the folder type dropdown (#5236)

diff --git a/ucs/kolab-ucs-join-script.sh b/ucs/kolab-ucs-join-script.sh
index 376dba8..aacccbe 100755
--- a/ucs/kolab-ucs-join-script.sh
+++ b/ucs/kolab-ucs-join-script.sh
@@ -143,16 +143,17 @@ udm settings/extended_attribute create "$@" --ignore_exists \
 	--set CLIName=KolabFolderType \
 	--append module=mail/folder \
 	--set tabName="General" \
-	--set tabAdvanced=0 \
-	--set overwriteTab=0 \
 	--append translationTabName='"de_AT" "Allgemein"' \
 	--append translationTabName='"de_CH" "Allgemein"' \
 	--append translationTabName='"de_DE" "Allgemein"' \
+	--set tabAdvanced=0 \
+	--set overwriteTab=0 \
+	--set tabPosition=99 \
 	--set shortDescription="Folder Type" \
 	--set longDescription="Folders can not only be used to share mail but also contacts, calendars, task lists, notes, or journals." \
-	--append translationShortDescription='"de_AT" "OrdnerTyp"' \
-	--append translationShortDescription='"de_CH" "OrdnerTyp"' \
-	--append translationShortDescription='"de_DE" "OrdnerTyp"' \
+	--append translationShortDescription='"de_AT" "Ordnertyp"' \
+	--append translationShortDescription='"de_CH" "Ordnertyp"' \
+	--append translationShortDescription='"de_DE" "Ordnertyp"' \
 	--append translationLongDescription='"de_AT" "Ordner können nicht nur für E-Mails gemeinsam genutzt werden, sondern auch für Adressbücher, Kalender, Aufgaben, Notizen und Journal."' \
 	--append translationLongDescription='"de_CH" "Ordner können nicht nur für E-Mails gemeinsam genutzt werden, sondern auch für Adressbücher, Kalender, Aufgaben, Notizen und Journal."' \
 	--append translationLongDescription='"de_DE" "Ordner können nicht nur für E-Mails gemeinsam genutzt werden, sondern auch für Adressbücher, Kalender, Aufgaben, Notizen und Journal."' \


commit a5675cde092efa943935f944239020336d2a938c
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Sep 29 17:32:22 2015 +0200

    kolab-ucs: Fix registration of KolabInvitationPolicies syntax class extension (#5248)

diff --git a/ucs/kolab-ucs-join-script.sh b/ucs/kolab-ucs-join-script.sh
index 69eacc3..376dba8 100755
--- a/ucs/kolab-ucs-join-script.sh
+++ b/ucs/kolab-ucs-join-script.sh
@@ -58,7 +58,7 @@ ucs_registerLDAPExtension "$@" \
 	--schema /usr/share/doc/kolab-schema/kolab3.schema \
 	--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_hook /usr/share/kolab-ucs/hookKolabEnabled.py \
 	--udm_syntax /usr/share/kolab-ucs/kolab-syntax-classes.py
 
 if [ "${kolab_home}" = "None" -o -z "${kolab_home}" ]; then


commit 79af3b7458361ea0994cbb23a896174218a54f49
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Sep 29 16:45:04 2015 +0200

    Remove KolabDelegate in unjoin (#5234)

diff --git a/ucs/kolab-ucs-unjoin-script.sh b/ucs/kolab-ucs-unjoin-script.sh
index e04c8dc..16d2564 100755
--- a/ucs/kolab-ucs-unjoin-script.sh
+++ b/ucs/kolab-ucs-unjoin-script.sh
@@ -45,6 +45,7 @@ for ATTRIBUTE in \
 	KolabEnabled \
 	KolabFolderType \
 	KolabInvitationPolicy \
+	KolabDelegate \
 	KolabForwardAddress \
 	KolabForwardActive \
 	KolabForwardKeepCopy \


commit 6cd00ac5219908a5912946f7cc571250c2d92053
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Sep 29 16:43:32 2015 +0200

    Remove KolabInvitationPolicy in unjoin (#5248)

diff --git a/ucs/kolab-ucs-unjoin-script.sh b/ucs/kolab-ucs-unjoin-script.sh
index dd9526d..e04c8dc 100755
--- a/ucs/kolab-ucs-unjoin-script.sh
+++ b/ucs/kolab-ucs-unjoin-script.sh
@@ -44,6 +44,7 @@ eval "$(ucr shell)"
 for ATTRIBUTE in \
 	KolabEnabled \
 	KolabFolderType \
+	KolabInvitationPolicy \
 	KolabForwardAddress \
 	KolabForwardActive \
 	KolabForwardKeepCopy \


commit 9752342cbaba014616c3c6068ce971c9919e5783
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Sep 29 16:42:21 2015 +0200

    Remove KolabFolderType in unjoin (#5236)

diff --git a/ucs/kolab-ucs-unjoin-script.sh b/ucs/kolab-ucs-unjoin-script.sh
index c260236..dd9526d 100755
--- a/ucs/kolab-ucs-unjoin-script.sh
+++ b/ucs/kolab-ucs-unjoin-script.sh
@@ -30,7 +30,7 @@
 # /usr/share/common-licenses/AGPL-3; if not, see
 # <http://www.gnu.org/licenses/>.
 
-VERSION=2
+VERSION=3
 
 . /usr/share/univention-join/joinscripthelper.lib
 . /usr/share/univention-lib/all.sh
@@ -43,6 +43,7 @@ eval "$(ucr shell)"
 # remove extented attributes
 for ATTRIBUTE in \
 	KolabEnabled \
+	KolabFolderType \
 	KolabForwardAddress \
 	KolabForwardActive \
 	KolabForwardKeepCopy \

More information about the commits mailing list