2 commits - ucs/kolab-imap-join-script.sh ucs/kolab-webclient-join-script.sh

[Christoph Wickert]

 ucs/kolab-imap-join-script.sh      |    1 +
 ucs/kolab-webclient-join-script.sh |   13 -------------
 2 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 767094813abd214d83da79da92d061b3de1653d1
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Thu Jan 29 17:57:13 2015 +0100

    Univention's mysql-server package already sets up the root password (#4347)

diff --git a/ucs/kolab-webclient-join-script.sh b/ucs/kolab-webclient-join-script.sh
index d1995af..536c684 100755
--- a/ucs/kolab-webclient-join-script.sh
+++ b/ucs/kolab-webclient-join-script.sh
@@ -35,19 +35,6 @@ if [ ! -e /var/run/mysqld/mysqld.sock ]; then
     test -x /etc/init.d/mysql && /etc/init.d/mysql start
 fi
 
-# set up mysql root password if none is set
-# FIXME: Univention should do this in an univention-mysql package
-if [ ! -e /etc/mysql.secret ]; then
-    passwd=$(makepasswd --nocrypt)
-    touch /etc/mysql.secret
-    chmod 600 /etc/mysql.secret
-    chown root /etc/mysql.secret
-    echo $passwd > /etc/mysql.secret
-    # set passwd for database user reservation
-    /usr/bin/mysqladmin -u root password "$passwd"
-    unset passwd
-fi
-
 # set up mysql roundcube password if none is set
 if [ ! -e /etc/roundcube.secret ]; then
     touch /etc/roundcube.secret


commit 91757ffbf962954112a7db32fe4f61bcf4c72f09
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Thu Jan 29 17:45:26 2015 +0100

    Exclude cyrus-admin from user list (#4346)

diff --git a/ucs/kolab-imap-join-script.sh b/ucs/kolab-imap-join-script.sh
index 043258d..d9b5592 100755
--- a/ucs/kolab-imap-join-script.sh
+++ b/ucs/kolab-imap-join-script.sh
@@ -49,6 +49,7 @@ if [ "${server_role}" = "domaincontroller_master" ]; then
         --set "username=cyrus-admin" \
         --set "firstname=Cyrus" \
         --set "lastname=Administrator" \
+        --set "objectFlag=hidden" \
         --position "cn=users,${ldap_base}" \
         >/dev/null 2>&1 && echo "OK" || echo "FAIL"
 fi