5 commits - ucs/conffiles ucs/kolab-imap-passwd-change.sh ucs/kolab-mta-join-script.sh ucs/kolab-webclient-join-script.sh ucs/kolab-webclient-passwd-change.sh

[Christoph Wickert]

 ucs/conffiles/etc/cyrus.conf.d/10_START_spool |    2 +-
 ucs/kolab-imap-passwd-change.sh               |   15 ++++++---------
 ucs/kolab-mta-join-script.sh                  |    2 +-
 ucs/kolab-webclient-join-script.sh            |    4 ++--
 ucs/kolab-webclient-passwd-change.sh          |    6 +++---
 5 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit f3c8ee13968e2fc071314bef1d7075a97dd2f3bd
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Sun Mar 22 21:21:05 2015 +0100

    Update headers (URL and licensse info)

diff --git a/ucs/kolab-imap-passwd-change.sh b/ucs/kolab-imap-passwd-change.sh
index 2e8ad3c..b3498b9 100755
--- a/ucs/kolab-imap-passwd-change.sh
+++ b/ucs/kolab-imap-passwd-change.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 #
-# Univention IMAP Server
+# Kolab IMAP Server
 #   machine password hook script
 #
 # Copyright 2011-2012 Univention GmbH
+# Copyright 2012-2015 Kolab Systems AG
 #
-# http://www.univention.de/
+# http://www.kolabsystems.com/
 #
 # All rights reserved.
 #
diff --git a/ucs/kolab-mta-join-script.sh b/ucs/kolab-mta-join-script.sh
index 1779c86..b5005b7 100755
--- a/ucs/kolab-mta-join-script.sh
+++ b/ucs/kolab-mta-join-script.sh
@@ -6,7 +6,7 @@
 # Copyright 2011-2012 Univention GmbH
 #           2011-1012 Kolab Systems AG
 #
-# http://www.kolabsys.com/
+# http://www.kolabsystems.com/
 #
 # All rights reserved.
 #
diff --git a/ucs/kolab-webclient-join-script.sh b/ucs/kolab-webclient-join-script.sh
index 8f924f8..b9085b4 100755
--- a/ucs/kolab-webclient-join-script.sh
+++ b/ucs/kolab-webclient-join-script.sh
@@ -2,9 +2,9 @@
 #
 # Kolab Webclient join script
 #
-# Copyright (C) 2012 Kolab Systems AG <contact at kolabsys.com>
+# Copyright (C) 2012 Kolab Systems AG <contact at kolabsystems.com>
 #
-# http://kolabsys.com/
+# http://kolabsystems.com/
 #
 # All rights reserved.
 #
diff --git a/ucs/kolab-webclient-passwd-change.sh b/ucs/kolab-webclient-passwd-change.sh
index ff0885d..bd109d8 100755
--- a/ucs/kolab-webclient-passwd-change.sh
+++ b/ucs/kolab-webclient-passwd-change.sh
@@ -5,7 +5,7 @@
 #
 # Copyright 2012 Kolab Systems AG
 #
-# http://www.kolabsys.com/
+# http://www.kolabsystems.com/
 #
 # All rights reserved.
 #


commit 2c5626fa31e3e75a075015709a13dbd328a8fba3
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Sun Mar 22 21:18:17 2015 +0100

    Remove obsolete reference to cyrus-ldap.secret (#4888)

diff --git a/ucs/kolab-imap-passwd-change.sh b/ucs/kolab-imap-passwd-change.sh
index 3757c2a..2e8ad3c 100755
--- a/ucs/kolab-imap-passwd-change.sh
+++ b/ucs/kolab-imap-passwd-change.sh
@@ -31,11 +31,6 @@
 # <http://www.gnu.org/licenses/>.
 
 if [ "$1" = "postchange" ] ; then
-	dest="/etc/cyrus-ldap.secret"
-	cp /etc/machine.secret "$dest"
-	chown cyrus:root "$dest"
-	chmod 600  "$dest"
-
 	univention-config-registry commit \
 		/etc/imapd.conf \
 		/etc/kolab/kolab.conf


commit dba4c9905434d59dd73e40a586aeff20aa56aa98
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Sun Mar 22 20:26:58 2015 +0100

    Commit /etc/imapd.conf after password change (#4887)

diff --git a/ucs/kolab-imap-passwd-change.sh b/ucs/kolab-imap-passwd-change.sh
index 7099081..3757c2a 100755
--- a/ucs/kolab-imap-passwd-change.sh
+++ b/ucs/kolab-imap-passwd-change.sh
@@ -36,6 +36,7 @@ if [ "$1" = "postchange" ] ; then
 	chown cyrus:root "$dest"
 	chmod 600  "$dest"
 
-	# Also update kolab.conf
-	ucr commit /etc/kolab/kolab.conf
+	univention-config-registry commit \
+		/etc/imapd.conf \
+		/etc/kolab/kolab.conf
 fi


commit 69fa26e14e2f73b06ec92be1831b2d40e9f1b686
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Sun Mar 22 20:02:26 2015 +0100

    Fix file names in kolab-webclient password change script (#4885)

diff --git a/ucs/kolab-webclient-passwd-change.sh b/ucs/kolab-webclient-passwd-change.sh
index c089ddf..ff0885d 100755
--- a/ucs/kolab-webclient-passwd-change.sh
+++ b/ucs/kolab-webclient-passwd-change.sh
@@ -33,7 +33,7 @@
 if [ "$1" = "postchange" ] ; then
         univention-config-registry commit \
                 /etc/roundcubemail/config.inc.php \
-                /etc/roundcubemail/plugins/calendar/config.inc.php \
-                /etc/roundcubemail/plugins/kolab_auth/config.inc.php
+                /etc/roundcubemail/calendar.inc.php \
+                /etc/roundcubemail/kolab_auth.inc.php
 fi
 


commit a7523eabe47b1b95bd5e6b8efed3e04e67546ebf
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Mar 10 15:15:09 2015 +0100

    Fix syntax error in 10_START_spool (#4480)

diff --git a/ucs/conffiles/etc/cyrus.conf.d/10_START_spool b/ucs/conffiles/etc/cyrus.conf.d/10_START_spool
index f4aa5cf..f551eba 100644
--- a/ucs/conffiles/etc/cyrus.conf.d/10_START_spool
+++ b/ucs/conffiles/etc/cyrus.conf.d/10_START_spool
@@ -19,5 +19,5 @@ if not (configRegistry.has_key('mail/cyrus/murder/master') and configRegistry['m
 	recover		cmd="ctl_cyrusdb -r"
   
 	# this is only necessary if using idled for IMAP IDLE
-	idled		cmd="idled"
+	idled		cmd="idled"'''
 @!@