ucs/kolab-ucs-join-script.sh

[Christoph Wickert]

 ucs/kolab-ucs-join-script.sh |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 995ee081d2fad62657e1977dbfb65ff117683cfc
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Thu Sep 17 15:56:07 2015 +0200

    univentionMailHomeServer is no longer available in the default user settings and we should not assign one in the template anyway (#4949)

diff --git a/ucs/kolab-ucs-join-script.sh b/ucs/kolab-ucs-join-script.sh
index b26ea34..df9eb83 100755
--- a/ucs/kolab-ucs-join-script.sh
+++ b/ucs/kolab-ucs-join-script.sh
@@ -78,7 +78,6 @@ echo -n "Creating Groupware Account template ... "
 udm settings/usertemplate create "$@" --ignore_exists \
 	--position cn=templates,cn=univention,${ldap_base} \
 	--set name="${domainname} Groupware Account" \
-	--set univentionMailHomeServer="${hostname}.${domainname}" \
 	--set mailPrimaryAddress="<username>@${domainname}" \
 	--set e-mail="<username>@${domainname}" \
 	--set unixhome="/home/<username>"
@@ -87,7 +86,7 @@ mail=$(udm settings/usertemplate list "$@" --filter="cn=$domainname Groupware Ac
 shell=$(udm settings/usertemplate list "$@" --filter="cn=$domainname Groupware Account" | grep ' shell:' | sed 's/[^:]*: //;s/^None$//')
 unixhome=$(udm settings/usertemplate list "$@" --filter="cn=$domainname Groupware Account" | grep ' unixhome:' | sed 's/[^:]*: //;s/^\/home\/$//')
 if [ -z "$mail" -o -z "$shell" -o -z "$unixhome" ]; then
-	udm settings/usertemplate modify --dn "cn=$domainname Groupware Account,cn=templates,cn=univention,$ldap_base" --set univentionMailHomeServer="$hostname.$domainname" --set mailPrimaryAddress="<username>@$domainname" --set e-mail="<username>@$domainname" --set shell="/bin/bash" --set unixhome="/home/<username>"
+	udm settings/usertemplate modify --dn "cn=$domainname Groupware Account,cn=templates,cn=univention,$ldap_base" --set mailPrimaryAddress="<username>@$domainname" --set e-mail="<username>@$domainname" --set shell="/bin/bash" --set unixhome="/home/<username>"
 fi
 
 # remove old '$hostname.$domainname Groupware Account' template (#1606)