Kolab Groupware OBS

kolab.spec Changed

debian.changelog Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/aliases -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/aliases Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/cyrus.conf.d/10_START_spool -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/cyrus.conf.d/10_START_spool Changed

@@ -1,27 +1,17 @@
-# Warning: This file is auto-generated and might be overwritten by
-#          univention-baseconfig.
-#          Please edit the files in the following directory instead:
-# Warnung: Diese Datei wurde automatisch generiert und kann durch
-#          univention-baseconfig überschrieben werden.
-#          Bitte bearbeiten Sie an Stelle dessen die Dateien in
-#          folgendem Verzeichnis:
-#
-#       /etc/univention/templates/files/etc/imapd/cyrus.conf.d/
-#
-
+@%@UCRWARNING=# @%@
 
 START {
 @!@
-if baseConfig.has_key('mail/cyrus/murder/backend/id') and baseConfig'mail/cyrus/murder/backend/id' != '':
-	emailId = baseConfig'mail/cyrus/murder/backend/id'
+if configRegistry.has_key('mail/cyrus/murder/backend/id') and configRegistry'mail/cyrus/murder/backend/id' != '':
+	emailId = configRegistry'mail/cyrus/murder/backend/id'
 else:
-	emailId = "%s@%s" % ('.'.join( baseConfig'hostname', baseConfig.get('domainname','undefined') ) , baseConfig.get('domainname','undefined'))
+	emailId = "%s@%s" % ('.'.join( configRegistry'hostname', configRegistry.get('domainname','undefined') ) , configRegistry.get('domainname','undefined'))
 
 # If we run without a Cyrus Murder Master MUPDATE server
 # or if we have registered as a 'kolab2' service provider (aka 'backend' or 'spool')
-if not (baseConfig.has_key('mail/cyrus/murder/master') and baseConfig'mail/cyrus/murder/master' != '') \
-   or (baseConfig.has_key('mail/cyrus/murder/backends') \
-       and emailId in baseConfig'mail/cyrus/murder/backends'.split(' ')):
+if not (configRegistry.has_key('mail/cyrus/murder/master') and configRegistry'mail/cyrus/murder/master' != '') \
+   or (configRegistry.has_key('mail/cyrus/murder/backends') \
+       and emailId in configRegistry'mail/cyrus/murder/backends'.split(' ')):
 	print'''
 	# --- Normal cyrus spool, or Murder backends ---
 
@@ -29,5 +19,5 @@
 	recover		cmd="ctl_cyrusdb -r"
   
 	# this is only necessary if using idled for IMAP IDLE
-	idled		cmd="idled"
+	idled		cmd="idled"'''
 @!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/cyrus.conf.d/20_SERVICES_spool -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/cyrus.conf.d/20_SERVICES_spool Changed

@@ -6,42 +6,42 @@
 # most services also accept -U (limit number of reuses) and -T (timeout)
 SERVICES {
 @!@
-if baseConfig.has_key('mail/cyrus/murder/backend/id') and baseConfig'mail/cyrus/murder/backend/id' != '':
-	backend_emailId = baseConfig'mail/cyrus/murder/backend/id'
+if configRegistry.has_key('mail/cyrus/murder/backend/id') and configRegistry'mail/cyrus/murder/backend/id' != '':
+	backend_emailId = configRegistry'mail/cyrus/murder/backend/id'
 else:
-	backend_emailId = "%s@%s" % ('.'.join( baseConfig'hostname', baseConfig.get('domainname','undefined') ) , baseConfig.get('domainname','undefined'))
-if baseConfig.has_key('mail/cyrus/murder/frontend/id') and baseConfig'mail/cyrus/murder/frontend/id' != '':
-	frontend_emailId = baseConfig'mail/cyrus/murder/frontend/id'
+	backend_emailId = "%s@%s" % ('.'.join( configRegistry'hostname', configRegistry.get('domainname','undefined') ) , configRegistry.get('domainname','undefined'))
+if configRegistry.has_key('mail/cyrus/murder/frontend/id') and configRegistry'mail/cyrus/murder/frontend/id' != '':
+	frontend_emailId = configRegistry'mail/cyrus/murder/frontend/id'
 else:
-	frontend_emailId = "%s@%s" % ('.'.join( baseConfig'hostname', baseConfig.get('domainname','undefined') ) , baseConfig.get('domainname','undefined'))
+	frontend_emailId = "%s@%s" % ('.'.join( configRegistry'hostname', configRegistry.get('domainname','undefined') ) , configRegistry.get('domainname','undefined'))
 
 # If we run without a Cyrus Murder Master MUPDATE server
 # or if we have registered as a 'kolab2' service provider (aka 'backend' or 'spool')
-if not (baseConfig.has_key('mail/cyrus/murder/master') and baseConfig'mail/cyrus/murder/master' != '') \
-   or (baseConfig.has_key('mail/cyrus/murder/backends') \
-       and backend_emailId in baseConfig'mail/cyrus/murder/backends'.split(' ')):
+if not (configRegistry.has_key('mail/cyrus/murder/master') and configRegistry'mail/cyrus/murder/master' != '') \
+   or (configRegistry.has_key('mail/cyrus/murder/backends') \
+       and backend_emailId in configRegistry'mail/cyrus/murder/backends'.split(' ')):
 	print '\t# --- Normal cyrus spool, or Murder backends ---'
 
 	bindprefix = ''
-	if baseConfig.has_key('mail/cyrus/murder/backend/interface') and baseConfig'mail/cyrus/murder/backend/interface' != '':
-		interface=baseConfig'mail/cyrus/murder/backend/interface'
+	if configRegistry.has_key('mail/cyrus/murder/backend/interface') and configRegistry'mail/cyrus/murder/backend/interface' != '':
+		interface=configRegistry'mail/cyrus/murder/backend/interface'
 		ucrVariable='interfaces/' + interface + '/address'
-		if baseConfig.has_key(ucrVariable) and baseConfigucrVariable != '':
-			bindprefix = "%s:" % baseConfigucrVariable
+		if configRegistry.has_key(ucrVariable) and configRegistryucrVariable != '':
+			bindprefix = "%s:" % configRegistryucrVariable
 
-	if baseConfig.has_key('mail/cyrus/imap') and baseConfig'mail/cyrus/imap' == 'yes':
+	if configRegistry.has_key('mail/cyrus/imap') and configRegistry'mail/cyrus/imap' == 'yes':
 
-		if baseConfig.has_key( 'mail/cyrus/imap/maxchilds' ):
-			maxchild = baseConfig 'mail/cyrus/imap/maxchilds' 
+		if configRegistry.has_key( 'mail/cyrus/imap/maxchilds' ):
+			maxchild = configRegistry 'mail/cyrus/imap/maxchilds' 
 		else:
 			maxchild = '400'
 
 		print '\timap		cmd="imapd -U 30" listen="%simap" prefork=0 maxchild=%s' % (bindprefix, maxchild)
 		print '\timaps		cmd="imapd -s -U 30" listen="%simaps" prefork=0 maxchild=%s' % (bindprefix, maxchild)
 
-	if baseConfig.has_key('mail/cyrus/pop') and baseConfig'mail/cyrus/pop' == 'yes':
-		if baseConfig.has_key( 'mail/cyrus/pop/maxchilds' ):
-			maxchild = baseConfig 'mail/cyrus/pop/maxchilds' 
+	if configRegistry.has_key('mail/cyrus/pop') and configRegistry'mail/cyrus/pop' == 'yes':
+		if configRegistry.has_key( 'mail/cyrus/pop/maxchilds' ):
+			maxchild = configRegistry 'mail/cyrus/pop/maxchilds' 
 		else:
 			maxchild = '400'
 
@@ -65,31 +65,31 @@
 	# useful if you need to give users remote access to sieve
 	# by default, we limit this to localhost in Debian'''
 
-	if baseConfig.has_key( 'mail/cyrus/sieve/maxchilds' ):
-		maxchild = baseConfig 'mail/cyrus/sieve/maxchilds' 
+	if configRegistry.has_key( 'mail/cyrus/sieve/maxchilds' ):
+		maxchild = configRegistry 'mail/cyrus/sieve/maxchilds' 
 	else:
 		maxchild = '400'
-	if baseConfig.has_key('mail/cyrus/sieve/listen_host') and baseConfig'mail/cyrus/sieve/listen_host':
-		if baseConfig'mail/cyrus/sieve/listen_host' == "all":
-			print'\tsieve		cmd="timsieved" listen=":sieve" prefork=0 maxchild=%s' % maxchild
+	if configRegistry.has_key('mail/cyrus/sieve/listen_host') and configRegistry'mail/cyrus/sieve/listen_host':
+		if configRegistry'mail/cyrus/sieve/listen_host' == "all":
+			print'\tsieve		cmd="timsieved" listen="sieve" prefork=0 maxchild=%s' % maxchild
 		else:
-			print'\tsieve		cmd="timsieved" listen="%s:sieve" prefork=0 maxchild=%s' % ( baseConfig'mail/cyrus/sieve/listen_host', maxchild )
+			print'\tsieve		cmd="timsieved" listen="%s:sieve" prefork=0 maxchild=%s' % ( configRegistry'mail/cyrus/sieve/listen_host', maxchild )
 	else:
 	    print'\tsieve		cmd="timsieved" listen="localhost:sieve" prefork=0 maxchild=%s' % maxchild
 
-elif baseConfig.has_key('mail/cyrus/murder/frontends') and frontend_emailId in baseConfig'mail/cyrus/murder/frontends'.split(' '):
+elif configRegistry.has_key('mail/cyrus/murder/frontends') and frontend_emailId in configRegistry'mail/cyrus/murder/frontends'.split(' '):
 	print'\n\t# useful if you need to give users remote access to sieve'
 	print'\t# by default, we limit this to localhost in Debian'
 
-	if baseConfig.has_key( 'mail/cyrus/sieve/maxchilds' ):
-		maxchild = baseConfig 'mail/cyrus/sieve/maxchilds' 
+	if configRegistry.has_key( 'mail/cyrus/sieve/maxchilds' ):
+		maxchild = configRegistry 'mail/cyrus/sieve/maxchilds' 
 	else:
 		maxchild = '400'
-	if baseConfig.has_key('mail/cyrus/sieve/listen_host') and baseConfig'mail/cyrus/sieve/listen_host':
-		if baseConfig'mail/cyrus/sieve/listen_host' == "all":
+	if configRegistry.has_key('mail/cyrus/sieve/listen_host') and configRegistry'mail/cyrus/sieve/listen_host':
+		if configRegistry'mail/cyrus/sieve/listen_host' == "all":
 			print'\tsieve		cmd="timsieved" listen=":sieve" prefork=0 maxchild=%s' % maxchild
 		else:
-			print'\tsieve		cmd="timsieved" listen="%s:sieve" prefork=0 maxchild=%s' % ( baseConfig'mail/cyrus/sieve/listen_host', maxchild )
+			print'\tsieve		cmd="timsieved" listen="%s:sieve" prefork=0 maxchild=%s' % ( configRegistry'mail/cyrus/sieve/listen_host', maxchild )
 	else:
 	    print'\tsieve		cmd="timsieved" listen="localhost:sieve" prefork=0 maxchild=%s' % maxchild

kolab-3.1.9.tar.gz/ucs/conffiles/etc/cyrus.conf.d/30_EVENT_spool -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/cyrus.conf.d/30_EVENT_spool Changed

@@ -2,15 +2,15 @@
 
 EVENTS {
 @!@
-if baseConfig.has_key('mail/cyrus/murder/backend/id') and baseConfig'mail/cyrus/murder/backend/id' != '':
-	backend_emailId = baseConfig'mail/cyrus/murder/backend/id'
+if configRegistry.has_key('mail/cyrus/murder/backend/id') and configRegistry'mail/cyrus/murder/backend/id' != '':
+	backend_emailId = configRegistry'mail/cyrus/murder/backend/id'
 else:
-	backend_emailId = "%s@%s" % ('.'.join( baseConfig'hostname', baseConfig.get('domainname','undefined') ) , baseConfig.get('domainname','undefined') )
+	backend_emailId = "%s@%s" % ('.'.join( configRegistry'hostname', configRegistry.get('domainname','undefined') ) , configRegistry.get('domainname','undefined') )
 # If we run without a Cyrus Murder Master MUPDATE server
 # or if we have registered as a 'kolab2' service provider (aka 'backend' or 'spool')
-if not (baseConfig.has_key('mail/cyrus/murder/master') and baseConfig'mail/cyrus/murder/master' != '') \
-   or (baseConfig.has_key('mail/cyrus/murder/backends') \
-       and backend_emailId in baseConfig'mail/cyrus/murder/backends'.split(' ')):
+if not (configRegistry.has_key('mail/cyrus/murder/master') and configRegistry'mail/cyrus/murder/master' != '') \
+   or (configRegistry.has_key('mail/cyrus/murder/backends') \
+       and backend_emailId in configRegistry'mail/cyrus/murder/backends'.split(' ')):
 	print '''
 	# --- Periodic care for normal cyrus spool, or Murder backends ---
 	checkpoint	cmd="ctl_cyrusdb -c" period=30

kolab-3.1.9.tar.gz/ucs/conffiles/etc/default/kolab-saslauthd -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/default/kolab-saslauthd Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/imapd.conf -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/imapd.conf Changed

@@ -1,23 +1,15 @@
-# Warning: This file is auto-generated and might be overwritten by
-#          univention-baseconfig.
-#          Please edit the following file instead:
-# Warnung: Diese Datei wurde automatisch generiert und kann durch
-#          univention-baseconfig überschrieben werden.
-#          Bitte bearbeiten Sie an Stelle dessen die folgende Datei:
-#
-#   /etc/univention/templates/files/etc/imapd.conf
-#
+@%@UCRWARNING=# @%@
 
 @!@
-if baseConfig.has_key('mail/cyrus/murder/backend/id') and baseConfig'mail/cyrus/murder/backend/id' != '':
-	emailId = baseConfig'mail/cyrus/murder/backend/id'
+if configRegistry.has_key('mail/cyrus/murder/backend/id') and configRegistry'mail/cyrus/murder/backend/id' != '':
+	emailId = configRegistry'mail/cyrus/murder/backend/id'
 	print 'servername: %s' % emailId:emailId.find('@')
 @!@
 configdirectory: /var/lib/imap
 partition-default: /var/spool/imap
 admins: cyrus-admin @!@
-if baseConfig.has_key('mail/cyrus/admins') and baseConfig'mail/cyrus/admins':
-    print '%s' % baseConfig'mail/cyrus/admins'.replace(',',' '),
+if configRegistry.has_key('mail/cyrus/admins') and configRegistry'mail/cyrus/admins':
+    print '%s' % configRegistry'mail/cyrus/admins'.replace(',',' '),
 @!@
 
 sievedir: /var/lib/imap/sieve
@@ -26,8 +18,8 @@
 sasl_mech_list: PLAIN LOGIN
 allowplaintext: no
 @!@
-print 'tls_server_cert: %s' % baseConfig.get('mail/cyrus/ssl/certificate', '/var/lib/imap/cert.pem')
-print 'tls_server_key: %s' % baseConfig.get('mail/cyrus/ssl/key', '/var/lib/imap/private.key')
+print 'tls_server_cert: %s' % configRegistry.get('mail/cyrus/ssl/certificate', '/var/lib/imap/cert.pem')
+print 'tls_server_key: %s' % configRegistry.get('mail/cyrus/ssl/key', '/var/lib/imap/private.key')
 
 @!@
 tls_session_timeout: 1440
@@ -64,7 +56,7 @@
 unixhierarchysep: 1
 virtdomains: userid
 annotation_definitions: /etc/imapd.annotations.conf
-sieve_extensions: fileinto reject envelope body vacation imapflags notify include regex subaddress relational copy
+sieve_extensions: fileinto reject envelope body vacation imapflags notify include regex subaddress relational copy date index
 allowallsubscribe: 0
 allowusermoves: 1
 altnamespace: 1

kolab-3.1.9.tar.gz/ucs/conffiles/etc/init.d/postfix -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/init.d/postfix Changed

@@ -1,20 +1,58 @@
-#!/bin/bash
+#!/bin/sh -e
 @%@UCRWARNING=# @%@
-
+#
+#
 # Start or stop Postfix
 #
 # LaMont Jones <lamont@debian.org>
 # based on sendmail's init.d script
 
+### BEGIN INIT INFO
+# Provides:          postfix mail-transport-agent
+# Required-Start:    $local_fs $remote_fs $syslog $named $network $time
+# Required-Stop:     $local_fs $remote_fs $syslog $named $network
+# Should-Start:      postgresql mysql clamav-daemon postgrey spamassassin saslauthd dovecot
+# Should-Stop:       postgresql mysql clamav-daemon postgrey spamassassin saslauthd dovecot
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: start and stop the Postfix Mail Transport Agent
+# Description:       postfix is a Mail Transport agent
+### END INIT INFO
+
+#
+# Copyright 2001-2015 Univention GmbH
+#
+# http://www.univention.de/
+#
+# All rights reserved.
+#
+# The source code of this program is made available
+# under the terms of the GNU Affero General Public License version 3
+# (GNU AGPL V3) as published by the Free Software Foundation.
+#
+# Binary versions of this program provided by Univention to you as
+# well as other copyrighted, protected or trademarked materials like
+# Logos, graphics, fonts, specific documentations and configurations,
+# cryptographic keys etc. are subject to a license agreement between
+# you and Univention and not subject to the GNU AGPL V3.
+#
+# In the case you use this program under the terms of the GNU AGPL V3,
+# the program is provided in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License with the Debian GNU/Linux or Univention distribution in file
+# /usr/share/common-licenses/AGPL-3; if not, see
+# <http://www.gnu.org/licenses/>.
+
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 DAEMON=/usr/sbin/postfix
-PIDFILE=/var/run/postfix.pid
 NAME=Postfix
 TZ=
 unset TZ
 
-. /lib/lsb/init-functions
-
 # Defaults - don't touch, edit /etc/default/postfix
 SYNC_CHROOT="y"
 
@@ -22,82 +60,240 @@
 
 test -x $DAEMON && test -f /etc/postfix/main.cf || exit 0
 
-case "$1" in
-    start)
-	log_action_msg "Starting mail transport agent: Postfix"
-
-        # check ucr autostart setting
-        if  -f "/usr/share/univention-config-registry/init-autostart.lib" ; then
-                source "/usr/share/univention-config-registry/init-autostart.lib"
-                check_autostart postfix postfix/autostart
-        fi
-
-	# see if anything is running chrooted.
-	NEED_CHROOT=$(awk '/^0-9a-z/ && ($5 == "-") { print "y"; exit}' /etc/postfix/master.cf)
-
-	if  -n "$NEED_CHROOT"  &&  -n "$SYNC_CHROOT" ; then
-	    # Make sure that the chroot environment is set up correctly.
-	    oldumask=$(umask)
-	    umask 022
-	    cd $(postconf -h queue_directory)
-
-	    # if we're using unix:passwd.byname, then we need to add etc/passwd.
-	    local_maps=$(postconf -h local_recipient_maps)
-	    if  "X$local_maps" != "X${local_maps#*unix:passwd.byname}" ; then
-		if  "X$local_maps" = "X${local_maps#*proxy:unix:passwd.byname}" ; then
-		    sed 's/^$^:*$:^:*/\1:x/' /etc/passwd > etc/passwd
-		    chmod a+r etc/passwd
+. /lib/lsb/init-functions
+#DISTRO=$(lsb_release -is 2>/dev/null || echo Debian)
+
+enabled_instances() {
+	postmulti -l -a | awk '($3=="y") { print $1}'
+}
+
+running() {
+    INSTANCE="$1"
+    if  "X$INSTANCE" = X ; then
+	    POSTCONF="postconf"
+    else
+	    POSTCONF="postmulti -i $INSTANCE -x postconf"
+    fi
+
+    queue=$($POSTCONF -h queue_directory 2>/dev/null || echo /var/spool/postfix)
+    if  -f ${queue}/pid/master.pid ; then
+	pid=$(sed 's/ //g' ${queue}/pid/master.pid)
+	# what directory does the executable live in.  stupid prelink systems.
+	dir=$(ls -l /proc/$pid/exe 2>/dev/null | sed 's/.* -> //; s/\/^\/*$//')
+	if  "X$dir" = "X/usr/lib/postfix" ; then
+	    echo y
+	fi
+    fi
+}
+
+configure_instance() {
+    INSTANCE="$1"
+    if  "X$INSTANCE" = X ; then
+	    POSTCONF="postconf"
+    else
+	    POSTCONF="postmulti -i $INSTANCE -x postconf"
+    fi
+
+
+    # if you set myorigin to 'ubuntu.com' or 'debian.org', it's wrong, and annoys the admins of
+    # those domains.  See also sender_canonical_maps.
+
+    MYORIGIN=$($POSTCONF -h myorigin | tr 'A-Z' 'a-z')
+    if  "X${MYORIGIN#/}" != "X${MYORIGIN}" ; then
+	MYORIGIN=$(tr 'A-Z' 'a-z' < $MYORIGIN)
+    fi
+    if  "X$MYORIGIN" = Xubuntu.com  ||  "X$MYORIGIN" = Xdebian.org ; then
+	log_failure_msg "Invalid \$myorigin ($MYORIGIN), refusing to start"
+	log_end_msg 1
+	exit 1
+    fi
+
+    config_dir=$($POSTCONF -h config_directory)
+    # see if anything is running chrooted.
+    NEED_CHROOT=$(awk '/^0-9a-z/ && ($5 ~ "-yY") { print "y"; exit}' ${config_dir}/master.cf)
+
+    if  -n "$NEED_CHROOT"  &&  -n "$SYNC_CHROOT" ; then
+	# Make sure that the chroot environment is set up correctly.
+	oldumask=$(umask)
+	umask 022
+	queue_dir=$($POSTCONF -h queue_directory)
+	cd "$queue_dir"
+
+	# copy the CA path if specified
+	ca_path=$($POSTCONF -h smtp_tls_CApath)
+	case "$ca_path" in
+	    '') :;; # no ca_path
+	    $queue_dir/*) :;;  # skip stuff already in chroot
+	    *)
+		if test -d "$ca_path"; then
+		    dest_dir="$queue_dir/${ca_path#/}"
+		    new=0
+		    if test -d "$dest_dir"; then
+			# write to a new directory ...
+			dest_dir="${dest_dir%/}.NEW"
+			new=1
+		    else
+			mkdir --parent ${dest_dir%/*}
+		    fi
+		    # handle files in subdirectories
+		    (cd "$ca_path" && find . -name '*.pem' -print0 | cpio -0pdL --quiet "$dest_dir") 2>/dev/null || 
+		        (log_failure_msg failure copying certificates; exit 1)
+		    c_rehash "$dest_dir" >/dev/null 2>&1
+		    if  "$new" = 1 ; then
+			# and replace the old directory
+			rm -r "${dest_dir%.NEW}"
+			mv "$dest_dir" "${dest_dir%.NEW}"
+		    fi
+		fi
+		;;
+	esac
+
+	# if there is a CA file, copy it
+	ca_file=$($POSTCONF -h smtp_tls_CAfile)
+	case "$ca_file" in
+	    $queue_dir/*) :;;  # skip stuff already in chroot
+	    '') # no ca_file
+		# or copy the bundle to preserve functionality
+		ca_bundle=/etc/ssl/certs/ca-certificates.crt
+		if  -f $ca_bundle ; then
+		    mkdir --parent "$queue_dir/${ca_bundle%/*}"
+		    cp -L "$ca_bundle" "$queue_dir/${ca_bundle%/*}"
+		fi
+		;;
+	    *)
+		if test -f "$ca_file"; then
+		    dest_dir="$queue_dir/${ca_path#/}"
+		    mkdir --parent "$dest_dir"
+		    cp -L "$ca_file" "$dest_dir"
 		fi
+		;;
+	esac
+
+	# if we're using unix:passwd.byname, then we need to add etc/passwd.
+	local_maps=$($POSTCONF -h local_recipient_maps)
+	if  "X$local_maps" != "X${local_maps#*unix:passwd.byname}" ; then
+	    if  "X$local_maps" = "X${local_maps#*proxy:unix:passwd.byname}" ; then
+		sed 's/^$^:*$:^:*/\1:x/' /etc/passwd > etc/passwd
+		chmod a+r etc/passwd
 	    fi
+	fi
+
+	FILES="etc/localtime etc/services etc/resolv.conf etc/hosts \
+	    etc/nsswitch.conf etc/nss_mdns.config"
+	for file in $FILES; do
+	     -d ${file%/*}  || mkdir -p ${file%/*}
+	    if  -f /${file} ; then rm -f ${file} && cp /${file} ${file}; fi
+	    if  -f  ${file} ; then chmod a+rX ${file}; fi
+	done
+	# ldaps needs this. debian bug 572841
+	(echo /dev/random; echo /dev/urandom) | cpio -pdL --quiet . 2>/dev/null || true
+	rm -f usr/lib/zoneinfo/localtime
+	mkdir -p usr/lib/zoneinfo
+	ln -sf /etc/localtime usr/lib/zoneinfo/localtime
+
+	LIBLIST=$(for name in gcc_s nss resolv; do
+	    for f in /lib/*/lib${name}*.so* /lib/lib${name}*.so*; do
+	       if  -f "$f" ; then  echo ${f#/}; fi;
+	    done;
+	done)
 
-	    FILES="etc/localtime etc/services etc/resolv.conf etc/hosts \
-		etc/nsswitch.conf"
-	    for file in $FILES; do 
-		 -d ${file%/*}  || mkdir -p ${file%/*}
-		if  -f /${file} ; then rm -f ${file} && cp /${file} ${file}; fi
-		if  -f  ${file} ; then chmod a+rX ${file}; fi
+	if  -n "$LIBLIST" ; then
+	    for f in "$LIBLIST"; do
+		rm -f "$f"
 	    done
-	    rm -f usr/lib/zoneinfo/localtime
-	    ln -sf /etc/localtime usr/lib/zoneinfo/localtime
-	    rm -f lib/libnss_*so*
-	    tar cf - /lib/libnss_*so* 2>/dev/null |tar xf -
-	    umask $oldumask
+	    tar cf - -C / $LIBLIST 2>/dev/null |tar xf -
 	fi
+	umask $oldumask
+    fi
+}
 
-	${DAEMON} start 2>&1 |
-		(grep -v 'starting the Postfix' 1>&2 || /bin/true)
-	log_action_end_msg 0
+case "$1" in
+    start)
+	log_daemon_msg "Starting Postfix Mail Transport Agent" postfix
+	# check ucr autostart setting
+	if  -f "/usr/share/univention-config-registry/init-autostart.lib" ; then
+	    . "/usr/share/univention-config-registry/init-autostart.lib"
+	    check_autostart postfix postfix/autostart
+	fi
+	RET=0
+	# for all instances that are not already running, handle chroot setup if needed, and start
+	for INSTANCE in $(enabled_instances); do
+	    RUNNING=$(running $INSTANCE)
+	    if  "X$RUNNING" = X ; then
+		configure_instance $INSTANCE
+		CMD="/usr/sbin/postmulti -- -i $INSTANCE -x ${DAEMON}"
+		if ! start-stop-daemon --start --exec $CMD quiet-quick-start; then
+		    RET=1
+		fi
+	    fi
+	done
+	log_end_msg $RET
     ;;
 
     stop)
-	log_action_msg "Stopping mail transport agent: Postfix"
-	${DAEMON} stop 2>&1 |
-		(grep -v 'stopping the Postfix' 1>&2 || /bin/true)
-	log_action_end_msg 0
+	log_daemon_msg "Stopping Postfix Mail Transport Agent" postfix
+	RET=0
+	# for all instances that are not already running, handle chroot setup if needed, and start
+	for INSTANCE in $(enabled_instances); do
+	    RUNNING=$(running $INSTANCE)
+	    if  "X$RUNNING" != X ; then
+		CMD="/usr/sbin/postmulti -i $INSTANCE -x ${DAEMON}"
+		if ! ${CMD} quiet-stop; then
+		    RET=1
+		fi
+	    fi
+	done
+	log_end_msg $RET
     ;;
 
     restart)
         $0 stop
         $0 start
     ;;
-    
+
     force-reload|reload)
-	log_action_msg "Reloading Postfix configuration"
-	${DAEMON} reload 2>&1 |
-		(grep -v 'refreshing the Postfix' 1>&2 || /bin/true)
-	log_action_end_msg 0
+	log_action_begin_msg "Reloading Postfix configuration"
+	if ${DAEMON} quiet-reload; then
+	    log_action_end_msg 0
+	else
+	    log_action_end_msg 1
+	fi
     ;;
 
-    flush)
-	${DAEMON} flush
+    status)
+	ALL=1
+	ANY=0
+	# for all instances that are not already running, handle chroot setup if needed, and start
+	for INSTANCE in $(enabled_instances); do
+	    RUNNING=$(running $INSTANCE)
+	    if  "X$RUNNING" != X ; then
+	    	ANY=1
+	    else
+	    	ALL=0
+	    fi
+	done
+	# handle the case when postmulti returns *no* configured instances
+	if  $ANY = 0 ; then
+	   ALL=0
+	fi
+	if  $ALL = 1 ; then
+	   log_success_msg "postfix is running"
+	   exit 0
+	elif  $ANY = 1 ; then
+	   log_success_msg "some postfix instances are running"
+	   exit 0
+	else
+	   log_success_msg "postfix is not running"
+	   exit 3
+	fi
     ;;
 
-    check)
-	${DAEMON} check
+    flush|check|abort)
+	${DAEMON} $1
     ;;
 
     *)
-	echo "Usage: /etc/init.d/postfix {start|stop|restart|reload|flush|check|force-reload}"
+	log_action_msg "Usage: /etc/init.d/postfix {start|stop|restart|reload|flush|check|abort|force-reload|status}"
 	exit 1
     ;;
 esac

kolab-3.1.9.tar.gz/ucs/conffiles/etc/kolab-freebusy/config.ini -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/kolab-freebusy/config.ini Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/header_checks.inbound -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/header_checks.inbound Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/header_checks.internal -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/header_checks.internal Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/header_checks.submission -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/header_checks.submission Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/ldap.canonicalrecipient.d/10_base -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/ldap.canonicalrecipient.d/10_base Changed

@@ -3,7 +3,6 @@
 # LDAP Recipient Canonical Maps support
 #
 
-server_host = ldap://@%@ldap/server/name@%@:@%@ldap/server/port@%@
 search_base = @%@ldap/base@%@
 domain = ldap:/etc/postfix/ldap.virtualdomains
 query_filter = (&(univentionCanonicalRecipientRewriteEnabled=1)(|(univentionPublicPrimaryMailAddress=%s)(univentionPublicAlternativeMailAddress=%s)))
@@ -14,8 +13,17 @@
 bind_dn = @%@ldap/hostdn@%@
 @!@
 import os
+from univention.lib.misc import getLDAPURIs
+print 'server_host = %s' % getLDAPURIs(configRegistry)
 if os.path.exists('/etc/machine.secret'):
 	print 'bind_pw = %s' % (open('/etc/machine.secret','r').read())
 else:
 	print 'bind_pw = MACHINE.SECRET_IS_MISSING'
+if configRegistry.is_true('mail/postfix/ldaptable/starttls', False):
+	print 'start_tls = yes'
+if configRegistry.is_true('mail/postfix/ldaptable/tlsrequirecert', False):
+	print 'tls_require_cert = yes'
+if configRegistry.get('mail/postfix/ldaptable/tlscacertfile'):
+	print 'tls_ca_cert_file = %s' % configRegistry'mail/postfix/ldaptable/tlscacertfile'
+print 'debuglevel = %s' % configRegistry.get('mail/postfix/ldaptable/debuglevel', '0')
 @!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/ldap.canonicalsender.d/10_base -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/ldap.canonicalsender.d/10_base Changed

@@ -3,7 +3,6 @@
 # LDAP Sender Canonical Maps support
 #
 
-server_host = ldap://@%@ldap/server/name@%@:@%@ldap/server/port@%@
 search_base = @%@ldap/base@%@
 domain = ldap:/etc/postfix/ldap.virtualdomains
 query_filter = (&(univentionCanonicalSenderRewriteEnabled=1)(|(univentionInternalPrimaryMailAddress=%s)(univentionInternalAlternativeMailAddress=%s)))
@@ -14,8 +13,17 @@
 bind_dn = @%@ldap/hostdn@%@
 @!@
 import os
+from univention.lib.misc import getLDAPURIs
+print 'server_host = %s' % getLDAPURIs(configRegistry)
 if os.path.exists('/etc/machine.secret'):
 	print 'bind_pw = %s' % (open('/etc/machine.secret','r').read())
 else:
 	print 'bind_pw = MACHINE.SECRET_IS_MISSING'
+if configRegistry.is_true('mail/postfix/ldaptable/starttls', False):
+	print 'start_tls = yes'
+if configRegistry.is_true('mail/postfix/ldaptable/tlsrequirecert', False):
+	print 'tls_require_cert = yes'
+if configRegistry.get('mail/postfix/ldaptable/tlscacertfile'):
+	print 'tls_ca_cert_file = %s' % configRegistry'mail/postfix/ldaptable/tlscacertfile'
+print 'debuglevel = %s' % configRegistry.get('mail/postfix/ldaptable/debuglevel', '0')
 @!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/ldap.distlist.d/10_base -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/ldap.distlist.d/10_base Changed

@@ -3,7 +3,6 @@
 # LDAP Distributionlist support
 #
 
-server_host = ldap://@%@ldap/server/name@%@:@%@ldap/server/port@%@
 search_base = @%@ldap/base@%@
 domain = ldap:/etc/postfix/ldap.virtualdomains
 query_filter = (&(objectClass=univentionMailList)(mailPrimaryAddress=%s))
@@ -14,8 +13,17 @@
 bind_dn = @%@ldap/hostdn@%@
 @!@
 import os
+from univention.lib.misc import getLDAPURIs
+print 'server_host = %s' % getLDAPURIs(configRegistry)
 if os.path.exists('/etc/machine.secret'):
 	print 'bind_pw = %s' % (open('/etc/machine.secret','r').read())
 else:
 	print 'bind_pw = MACHINE.SECRET_IS_MISSING'
+if configRegistry.is_true('mail/postfix/ldaptable/starttls', False):
+	print 'start_tls = yes'
+if configRegistry.is_true('mail/postfix/ldaptable/tlsrequirecert', False):
+	print 'tls_require_cert = yes'
+if configRegistry.get('mail/postfix/ldaptable/tlscacertfile'):
+	print 'tls_ca_cert_file = %s' % configRegistry'mail/postfix/ldaptable/tlscacertfile'
+print 'debuglevel = %s' % configRegistry.get('mail/postfix/ldaptable/debuglevel', '0')
 @!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/ldap.groups.d/10_base -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/ldap.groups.d/10_base Changed

@@ -3,7 +3,6 @@
 # LDAP Mail Groups
 #
 
-server_host = ldap://@%@ldap/server/name@%@:@%@ldap/server/port@%@
 search_base = @%@ldap/base@%@
 domain = ldap:/etc/postfix/ldap.virtualdomains
 query_filter = (&(mailPrimaryAddress=%s)(objectclass=posixGroup))
@@ -15,8 +14,17 @@
 bind_dn = @%@ldap/hostdn@%@
 @!@
 import os
+from univention.lib.misc import getLDAPURIs
+print 'server_host = %s' % getLDAPURIs(configRegistry)
 if os.path.exists('/etc/machine.secret'):
 	print 'bind_pw = %s' % (open('/etc/machine.secret','r').read())
 else:
 	print 'bind_pw = MACHINE.SECRET_IS_MISSING'
+if configRegistry.is_true('mail/postfix/ldaptable/starttls', False):
+	print 'start_tls = yes'
+if configRegistry.is_true('mail/postfix/ldaptable/tlsrequirecert', False):
+	print 'tls_require_cert = yes'
+if configRegistry.get('mail/postfix/ldaptable/tlscacertfile'):
+	print 'tls_ca_cert_file = %s' % configRegistry'mail/postfix/ldaptable/tlscacertfile'
+print 'debuglevel = %s' % configRegistry.get('mail/postfix/ldaptable/debuglevel', '0')
 @!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/ldap.sharedfolderlocal.d/10_base -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/ldap.sharedfolderlocal.d/10_base Changed

@@ -4,7 +4,6 @@
 # rewrite mail address for shared imap folders if univentionMailHomeServer is my fqdn
 #
 
-server_host = ldap://@%@ldap/server/name@%@:@%@ldap/server/port@%@
 search_base = @%@ldap/base@%@
 domain = ldap:/etc/postfix/ldap.virtualdomains
 query_filter = (&(objectClass=univentionMailSharedFolder)(|(mailPrimaryAddress=%s)(mailAlternativeAddress=%s)(univentionMailSharedFolderDeliveryAddress=%s))(univentionMailHomeServer=@%@hostname@%@.@%@domainname@%@))
@@ -16,8 +15,17 @@
 bind_dn = @%@ldap/hostdn@%@
 @!@
 import os
+from univention.lib.misc import getLDAPURIs
+print 'server_host = %s' % getLDAPURIs(configRegistry)
 if os.path.exists('/etc/machine.secret'):
 	print 'bind_pw = %s' % (open('/etc/machine.secret','r').read())
 else:
 	print 'bind_pw = MACHINE.SECRET_IS_MISSING'
+if configRegistry.is_true('mail/postfix/ldaptable/starttls', False):
+	print 'start_tls = yes'
+if configRegistry.is_true('mail/postfix/ldaptable/tlsrequirecert', False):
+	print 'tls_require_cert = yes'
+if configRegistry.get('mail/postfix/ldaptable/tlscacertfile'):
+	print 'tls_ca_cert_file = %s' % configRegistry'mail/postfix/ldaptable/tlscacertfile'
+print 'debuglevel = %s' % configRegistry.get('mail/postfix/ldaptable/debuglevel', '0')
 @!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/ldap.sharedfolderremote.d/10_base -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/ldap.sharedfolderremote.d/10_base Changed

@@ -4,7 +4,6 @@
 # find mail address for shared imap folders and do not rewrite recipient address if univentionMailHomeServer is NOT my fqdn
 #
 
-server_host = ldap://@%@ldap/server/name@%@:@%@ldap/server/port@%@
 search_base = @%@ldap/base@%@
 domain = ldap:/etc/postfix/ldap.virtualdomains
 query_filter = (&(objectClass=univentionMailSharedFolder)(|(mailPrimaryAddress=%s)(mailAlternativeAddress=%s))(!(univentionMailHomeServer=@%@hostname@%@.@%@domainname@%@)))
@@ -16,8 +15,17 @@
 bind_dn = @%@ldap/hostdn@%@
 @!@
 import os
+from univention.lib.misc import getLDAPURIs
+print 'server_host = %s' % getLDAPURIs(configRegistry)
 if os.path.exists('/etc/machine.secret'):
 	print 'bind_pw = %s' % (open('/etc/machine.secret','r').read())
 else:
 	print 'bind_pw = MACHINE.SECRET_IS_MISSING'
+if configRegistry.is_true('mail/postfix/ldaptable/starttls', False):
+	print 'start_tls = yes'
+if configRegistry.is_true('mail/postfix/ldaptable/tlsrequirecert', False):
+	print 'tls_require_cert = yes'
+if configRegistry.get('mail/postfix/ldaptable/tlscacertfile'):
+	print 'tls_ca_cert_file = %s' % configRegistry'mail/postfix/ldaptable/tlscacertfile'
+print 'debuglevel = %s' % configRegistry.get('mail/postfix/ldaptable/debuglevel', '0')
 @!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/ldap.transportlocal.d/10_base -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/ldap.transportlocal.d/10_base Changed

@@ -4,7 +4,6 @@
 # if mail shall not be delivered locally then send it to univentionMailHomeServer
 #
 
-server_host = ldap://@%@ldap/server/name@%@:@%@ldap/server/port@%@
 search_base = @%@ldap/base@%@
 domain = ldap:/etc/postfix/ldap.virtualdomains
 query_filter = (&(mailPrimaryAddress=%s)(univentionMailHomeServer=@%@hostname@%@.@%@domainname@%@))
@@ -16,8 +15,17 @@
 bind_dn = @%@ldap/hostdn@%@
 @!@
 import os
+from univention.lib.misc import getLDAPURIs
+print 'server_host = %s' % getLDAPURIs(configRegistry)
 if os.path.exists('/etc/machine.secret'):
 	print 'bind_pw = %s' % (open('/etc/machine.secret','r').read())
 else:
 	print 'bind_pw = MACHINE.SECRET_IS_MISSING'
+if configRegistry.is_true('mail/postfix/ldaptable/starttls', False):
+	print 'start_tls = yes'
+if configRegistry.is_true('mail/postfix/ldaptable/tlsrequirecert', False):
+	print 'tls_require_cert = yes'
+if configRegistry.get('mail/postfix/ldaptable/tlscacertfile'):
+	print 'tls_ca_cert_file = %s' % configRegistry'mail/postfix/ldaptable/tlscacertfile'
+print 'debuglevel = %s' % configRegistry.get('mail/postfix/ldaptable/debuglevel', '0')
 @!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/ldap.transportremote.d/10_base -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/ldap.transportremote.d/10_base Changed

@@ -4,7 +4,6 @@
 # if mail shall not be delivered locally then send it to univentionMailHomeServer
 #
 
-server_host = ldap://@%@ldap/server/name@%@:@%@ldap/server/port@%@
 search_base = @%@ldap/base@%@
 domain = ldap:/etc/postfix/ldap.virtualdomains
 query_filter = (&(mailPrimaryAddress=%s)(univentionMailHomeServer=*)(!(univentionMailHomeServer=@%@hostname@%@.@%@domainname@%@)))
@@ -16,8 +15,17 @@
 bind_dn = @%@ldap/hostdn@%@
 @!@
 import os
+from univention.lib.misc import getLDAPURIs
+print 'server_host = %s' % getLDAPURIs(configRegistry)
 if os.path.exists('/etc/machine.secret'):
 	print 'bind_pw = %s' % (open('/etc/machine.secret','r').read())
 else:
 	print 'bind_pw = MACHINE.SECRET_IS_MISSING'
+if configRegistry.is_true('mail/postfix/ldaptable/starttls', False):
+	print 'start_tls = yes'
+if configRegistry.is_true('mail/postfix/ldaptable/tlsrequirecert', False):
+	print 'tls_require_cert = yes'
+if configRegistry.get('mail/postfix/ldaptable/tlscacertfile'):
+	print 'tls_ca_cert_file = %s' % configRegistry'mail/postfix/ldaptable/tlscacertfile'
+print 'debuglevel = %s' % configRegistry.get('mail/postfix/ldaptable/debuglevel', '0')
 @!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/ldap.virtual.d/10_base -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/ldap.virtual.d/10_base Changed

@@ -3,7 +3,6 @@
 # LDAP Alias support (without recipient canonical rewrite)
 #
 
-server_host = ldap://@%@ldap/server/name@%@:@%@ldap/server/port@%@
 search_base = @%@ldap/base@%@
 domain = ldap:/etc/postfix/ldap.virtualdomains
 query_filter = (&(objectClass=univentionKolabInetOrgPerson)(|(uid=%s)(uid=%u)(mailAlternativeAddress=%s)(mailPrimaryAddress=%s))(!(univentionCanonicalRecipientRewriteEnabled=1)))
@@ -15,8 +14,17 @@
 bind_dn = @%@ldap/hostdn@%@
 @!@
 import os
+from univention.lib.misc import getLDAPURIs
+print 'server_host = %s' % getLDAPURIs(configRegistry)
 if os.path.exists('/etc/machine.secret'):
 	print 'bind_pw = %s' % (open('/etc/machine.secret','r').read())
 else:
 	print 'bind_pw = MACHINE.SECRET_IS_MISSING'
+if configRegistry.is_true('mail/postfix/ldaptable/starttls', False):
+	print 'start_tls = yes'
+if configRegistry.is_true('mail/postfix/ldaptable/tlsrequirecert', False):
+	print 'tls_require_cert = yes'
+if configRegistry.get('mail/postfix/ldaptable/tlscacertfile'):
+	print 'tls_ca_cert_file = %s' % configRegistry'mail/postfix/ldaptable/tlscacertfile'
+print 'debuglevel = %s' % configRegistry.get('mail/postfix/ldaptable/debuglevel', '0')
 @!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/ldap.virtualdomains.d/10_base -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/ldap.virtualdomains.d/10_base Changed

@@ -3,7 +3,6 @@
 # LDAP Virtual Domains
 #
 
-server_host = ldap://@%@ldap/server/name@%@:@%@ldap/server/port@%@
 search_base = @%@ldap/base@%@
 query_filter = (&(objectClass=univentionMailDomainname)(cn=%s))
 result_attribute = cn
@@ -14,8 +13,17 @@
 bind_dn = @%@ldap/hostdn@%@
 @!@
 import os
+from univention.lib.misc import getLDAPURIs
+print 'server_host = %s' % getLDAPURIs(configRegistry)
 if os.path.exists('/etc/machine.secret'):
 	print 'bind_pw = %s' % (open('/etc/machine.secret','r').read())
 else:
 	print 'bind_pw = MACHINE.SECRET_IS_MISSING'
+if configRegistry.is_true('mail/postfix/ldaptable/starttls', False):
+	print 'start_tls = yes'
+if configRegistry.is_true('mail/postfix/ldaptable/tlsrequirecert', False):
+	print 'tls_require_cert = yes'
+if configRegistry.get('mail/postfix/ldaptable/tlscacertfile'):
+	print 'tls_ca_cert_file = %s' % configRegistry'mail/postfix/ldaptable/tlscacertfile'
+print 'debuglevel = %s' % configRegistry.get('mail/postfix/ldaptable/debuglevel', '0')
 @!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/ldap.virtualwithcanonical.d/10_base -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/ldap.virtualwithcanonical.d/10_base Changed

@@ -3,7 +3,6 @@
 # LDAP Alias support (with recipient canonical rewrite)
 #
 
-server_host = ldap://@%@ldap/server/name@%@:@%@ldap/server/port@%@
 search_base = @%@ldap/base@%@
 domain = ldap:/etc/postfix/ldap.virtualdomains
 query_filter = (&(objectClass=univentionMail)(|(mailAlternativeAddress=%s)(mailPrimaryAddress=%s))(univentionCanonicalRecipientRewriteEnabled=1))
@@ -15,8 +14,17 @@
 bind_dn = @%@ldap/hostdn@%@
 @!@
 import os
+from univention.lib.misc import getLDAPURIs
+print 'server_host = %s' % getLDAPURIs(configRegistry)
 if os.path.exists('/etc/machine.secret'):
 	print 'bind_pw = %s' % (open('/etc/machine.secret','r').read())
 else:
 	print 'bind_pw = MACHINE.SECRET_IS_MISSING'
+if configRegistry.is_true('mail/postfix/ldaptable/starttls', False):
+	print 'start_tls = yes'
+if configRegistry.is_true('mail/postfix/ldaptable/tlsrequirecert', False):
+	print 'tls_require_cert = yes'
+if configRegistry.get('mail/postfix/ldaptable/tlscacertfile'):
+	print 'tls_ca_cert_file = %s' % configRegistry'mail/postfix/ldaptable/tlscacertfile'
+print 'debuglevel = %s' % configRegistry.get('mail/postfix/ldaptable/debuglevel', '0')
 @!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/main.cf.d/10_general -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/main.cf.d/10_general Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/main.cf.d/60_tls -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/main.cf.d/60_tls Changed

@@ -4,9 +4,9 @@
 smtpd_starttls_timeout = 300s
 smtpd_timeout = 300s
 @!@
-fqdn = '%s.%s' % (baseConfig.get('hostname'), baseConfig.get('domainname'))
-print 'smtpd_tls_cert_file = %s' % baseConfig.get('mail/postfix/ssl/certificate', '/etc/univention/ssl/%s/cert.pem' % fqdn)
-print 'smtpd_tls_key_file = %s' % baseConfig.get('mail/postfix/ssl/key', '/etc/univention/ssl/%s/private.key' % fqdn)
+fqdn = '%s.%s' % (configRegistry.get('hostname'), configRegistry.get('domainname'))
+print 'smtpd_tls_cert_file = %s' % configRegistry.get('mail/postfix/ssl/certificate', '/etc/univention/ssl/%s/cert.pem' % fqdn)
+print 'smtpd_tls_key_file = %s' % configRegistry.get('mail/postfix/ssl/key', '/etc/univention/ssl/%s/private.key' % fqdn)
 @!@
 smtpd_tls_received_header = no
 smtpd_tls_session_cache_timeout = 3600s
@@ -20,7 +20,7 @@
 
 # smtp client
 @!@
-print 'smtp_tls_security_level = %s' % baseConfig.get('mail/postfix/tls/client/level', 'none')
+print 'smtp_tls_security_level = %s' % configRegistry.get('mail/postfix/tls/client/level', 'none')
 @!@
 
 # Support broken clients like Microsoft Outlook Express 4.x which expect AUTH=LOGIN instead of AUTH LOGIN

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/master.cf.d/10_services -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/master.cf.d/10_services Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/master.cf.d/60_kolab -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/master.cf.d/60_kolab Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/postfix/sasl/smtpd.conf -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/postfix/sasl/smtpd.conf Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/acl.inc.php -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/roundcubemail/acl.inc.php Changed

@@ -1,23 +1,28 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
 // Default look of access rights table
 // In advanced mode all access rights are displayed separately
 // In simple mode access rights are grouped into four groups: read, write, delete, full 
-$config'acl_advanced_mode' = false;
+    $config'acl_advanced_mode' = false;
 
 // LDAP addressbook that would be searched for user names autocomplete.
 // That should be an array refering to the $config'ldap_public' array key
 // or complete addressbook configuration array.
-$config'acl_users_source' = 'global';
+    $config'acl_users_source' = 'kolab_addressbook';
 
 // The LDAP attribute which will be used as ACL user identifier
 $config'acl_users_field' = 'mailPrimaryAddress';
 
 // The LDAP search filter will be &'d with search queries
-$config'acl_users_filter' = 'objectClass=kolabInetOrgPerson';
+    $config'acl_users_filter' = 'objectClass=kolabInetOrgPerson';
+
+    $config'acl_groups' = true;
+    $config'acl_group_prefix' = 'group:';
+
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . $_SERVER"HTTP_HOST" . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . $_SERVER"HTTP_HOST" . '/' . basename(__FILE__));
+    }
 
 ?>

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/calendar.inc.php -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/roundcubemail/calendar.inc.php Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/config.inc.php -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/roundcubemail/config.inc.php Changed

@@ -1,8 +1,6 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
     $config = array();
 
@@ -11,17 +9,10 @@
 if os.path.exists('/etc/roundcube.secret'):
 	print "    $config'db_dsnw' = 'mysql://roundcube:%s@localhost/roundcubemail';" % (open('/etc/roundcube.secret','r').read().strip());
 else:
-	print "    $config'db_dsnw' = 'ROUNDCUBE.SECRET_IS_MISSING'";
+	print "    $config'db_dsnw' = 'ROUNDCUBE.SECRET_IS_MISSING';";
 @!@
 
     $config'session_domain' = '';
-    $config'username_domain' = '@%@domainname@%@';
-    $config'mail_domain' = '@%@domainname@%@';
-
-    $config'force_https' = @%@mail/kolab/https@%@;
-
-    $config'use_secure_urls' = true;
-    $config'assets_path' = '/roundcubemail/assets/';
 
 @!@
 import os
@@ -31,6 +22,15 @@
     print "    $config'des_key' = 'rcmail-!24ByteDESkey*Str';";
 @!@
 
+    $config'username_domain' = '@%@domainname@%@';
+    $config'use_secure_urls' = true;
+    $config'assets_path' = '/roundcubemail/assets/';
+    $config'assets_dir' = '/usr/share/roundcubemail/public_html/assets/';
+
+    $config'mail_domain' = '@%@domainname@%@';
+
+    $config'force_https' = @%@mail/kolab/https@%@;
+
     // IMAP Server Settings
     $config'default_host' = '@%@mail/roundcube/imap/server@%@';
     $config'default_port' = @%@mail/roundcube/imap/port@%@;
@@ -42,7 +42,7 @@
     $config'imap_cache' = 'db';
     $config'imap_cache_ttl' = '10d';
     $config'messages_cache' = 'db';
-    $config'messages_cache_ttl' = '10d';
+    $config'message_cache_ttl' = '10d';
     $config'session_storage' = 'db';
 
     // SMTP Server Settings
@@ -59,7 +59,6 @@
 
     // Kolab specific defaults
     $config'product_name' = 'Kolab Groupware';
-    $config'skin_logo' = 'skins/kolab/images/kolab_logo_white.png';
     $config'quota_zero_as_unlimited' = false;
     $config'login_lc' = 2;
     $config'auto_create_user' = true;
@@ -69,23 +68,27 @@
 
     // Plugins
     $config'plugins' = array(
+            'kolab_auth',
             'acl',
             'archive',
             'calendar',
             'jqueryui',
+            'kolab_activesync',
             'kolab_addressbook',
-            'kolab_auth',
+            'kolab_config',
+            'kolab_delegation',
             'kolab_files',
             'kolab_folders',
-            'logon_page',
+            'kolab_notes',
+            'kolab_tags',
+            'libkolab',
+            'libcalendaring',
             'managesieve',
-            'markasjunk',
             'newmail_notifier',
             'odfviewer',
             'password',
             'redundant_attachments',
             'tasklist',
-            'threading_as_default',
             // contextmenu must be after kolab_addressbook (#444)
             'contextmenu',
         );
@@ -101,7 +104,7 @@
 
     $config'session_lifetime' = 180;
     $config'password_charset' = 'UTF-8';
-    $config'useragent' = 'Kolab 3.1/Roundcube ' . RCUBE_VERSION;
+    $config'useragent' = 'Kolab Enterprise 14/Roundcube ' . RCUBE_VERSION;
     $config'dont_override' = Array('skin');
 
     $config'message_sort_col' = 'date';
@@ -119,9 +122,7 @@
     $config'preview_pane_mark_read' = 0;
 
     $config'autoexpand_threads' = 2;
-
-    // Bottom posting for reply mode
-    $config'reply_mode' = 0;
+    $config'top_posting' = 0;
     $config'sig_above' = false;
     $config'mdn_requests' = 0;
     $config'mdn_default' = false;
@@ -138,11 +139,11 @@
     $config'log_date_format' = 'd-M-Y H:i:s,u O';
     $config'syslog_id' = 'roundcube';
     $config'syslog_facility' = LOG_USER;
-    $config'smtp_log' = true;
+    $config'smtp_log' = false;
     $config'log_logins' = true;
     $config'log_session' = true;
 @!@
-if not baseConfig.get('mail/kolab/debug', '0') == '0':
+if not configRegistry.get('mail/kolab/debug', '0') == '0':
     print "    $config'debug_level' = 1;"
     print "    $config'devel_mode' = true;"
     print "    $config'sql_debug' = true;"
@@ -163,7 +164,7 @@
     print "    $config'activesync_debug' = false;"
     print "    $config'activesync_user_log' = false;"
 @!@
-    $config'skin' = 'larry';
+    $config'skin' = 'enterprise';
     $config'skin_include_php' = false;
     $config'mime_magic' = null;
     $config'im_identify_path' = '/usr/bin/identify';
@@ -171,7 +172,9 @@
     $config'log_dir' = 'logs/';
     $config'temp_dir' = '/var/lib/roundcubemail/';
 
+    // Some additional default folders (archive plugin)
     $config'archive_mbox' = 'Archive';
+    // The Kolab daemon by default creates 'Spam'
     $config'junk_mbox' = 'Spam';
     $config'default_folders' = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash', 'Archive');
 
@@ -180,13 +183,13 @@
     $config'autocomplete_threads' = 0;
     $config'autocomplete_max' = 15;
     $config'ldap_public' = array(
-            'global' => Array(
+            'kolab_addressbook' => array(
                     'name'                      => 'Global Address Book',
                     'hosts'                     => array('@%@ldap/server/name@%@'),
                     'port'                      => @%@ldap/server/port@%@,
                     'use_tls'                   => false,
-                    'user_specific'             => true,
                     'base_dn'                   => '@%@ldap/base@%@',
+                    'user_specific'             => true,
                     'bind_dn'                   => '%dn',
                     'bind_pass'                 => '',
                     'search_base_dn'            => '@%@ldap/base@%@',
@@ -207,23 +210,24 @@
                     'search_fields'             => array('mailPrimaryAddress', 'cn'),
                     'sort'                      => array('sn', 'initials', 'displayname', 'givenname', 'uid'),
                     'scope'                     => 'sub',       // search mode: sub|base|list
-                    'filter'                    => '(objectClass=kolabInetOrgPerson)',
+                    'filter'                    => '(&(objectClass=kolabInetOrgPerson)(!(|(univentionObjectFlag=functional)(univentionObjectFlag=hidden)(univentionObjectFlag=temporary))))',
                     'fuzzy_search'              => true,
                     'sizelimit'                 => '0',
                     'timelimit'                 => '0',
                     'fieldmap'                  => Array(
-                            // Roundcube        => LDAP
-                            'name'              => 'cn',
-                            'firstname'         => 'givenName',
+                            // Roundcube        => LDAP:limit
+                            'name'              => 'displayName',
                             'surname'           => 'sn',
-                            'email:work'        => 'mailPrimaryAddress',
-                            'email:other'       => 'mailAlternativeAddress',
+                            'firstname'         => 'givenName',
+                            'prefix'            => 'title',
+                            'email:primary'     => 'mailPrimaryAddress:1',
+                            'email:other'       => 'mailAlternativeAddress:*',
+                            'email:work'        => 'mail:*',
                             'nickname'          => 'displayName',
                             'jobtitle'          => 'title',
                             'organization'      => 'o',
                             'phone:home'        => 'homePhone',
                             'phone:home2'       => 'mobile',
-                            'phone:home2'       => 'mobile',
                             'phone:work'        => 'telephoneNumber',
                             'phone:mobile'      => 'mobile',
                             //'phone:main'        => 'telephoneNumber',
@@ -233,6 +237,7 @@
                             'zipcode:work'      => 'postalCode',
                             'country:work'      => 'c',
                             'birthday'          => 'univentionBirthday',
+                            'photo'             => 'jpegphoto'
                         ),
                     'groups'                    => Array(
                             'base_dn'           => '@%@ldap/base@%@',
@@ -241,11 +246,10 @@
                             'object_classes'    => array("top", "univentionKolabGroup"),
                         ),
                 ),
-
         );
 
     $config'autocomplete_addressbooks' = Array(
-            'global'
+            'kolab_addressbook'
         );
 
     $config'autocomplete_single' = true;
@@ -258,5 +262,4 @@
             'ssl_cafile'     => '/etc/univention/ssl/ucsCA/CAcert.pem'
         );
 
-
 ?>

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/jqueryui.inc.php -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/roundcubemail/jqueryui.inc.php Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/kolab_addressbook.inc.php -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/roundcubemail/kolab_addressbook.inc.php Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/kolab_auth.inc.php -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/roundcubemail/kolab_auth.inc.php Changed

@@ -1,104 +1,109 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
-// The id of the LDAP address book (which refers to the $config'ldap_public')
-// or complete addressbook definition array.
-//$config'kolab_auth_addressbook' = '';
-$config'kolab_auth_addressbook' = array(
-        'name'                  => 'Kolab Auth',
-        'hosts'                 => array('@%@ldap/server/name@%@'),
-        'port'                  => @%@ldap/server/port@%@,
-        'use_tls'               => false,
-        'user_specific'         => false,
-        'base_dn'               => '@%@ldap/base@%@',
-        'bind_dn'               => '@%@ldap/hostdn@%@',
+    // The id of the LDAP address book (which refers to the rcmail_config'ldap_public')
+    // or complete addressbook definition array.
+    $config'kolab_auth_addressbook' = Array(
+        'name'                      => 'Kolab Auth',
+        'hosts'                     => Array('@%@ldap/server/name@%@'),
+        'port'                      => @%@ldap/server/port@%@,
+        'use_tls'                   => false,
+        'user_specific'             => false,
+        'base_dn'                   => '@%@ldap/base@%@',
+        'bind_dn'                   => '@%@ldap/hostdn@%@',
 @!@
 import os
 if os.path.exists('/etc/machine.secret'):
- print "        'bind_pass'             => '%s'," % (open('/etc/machine.secret','r').read().strip())
+ print "        'bind_pass'                 => '%s'," % (open('/etc/machine.secret','r').read().strip())
 else:
- print "        'bind_pass'             => 'MACHINE.SECRET_IS_MISSING',"
+ print "        'bind_pass'                 => 'MACHINE.SECRET_IS_MISSING',"
 @!@
-        'writable'              => false,
-        'ldap_version'          => 3,       // using LDAPv3
-        'fieldmap' => array(
-                'name'    => 'cn',
-                'email'   => 'mailprimaryaddress',
-                'alias'   => 'alias',
+        'writable'                  => false,
+        'ldap_version'              => 3,       // using LDAPv3
+        'fieldmap'                  => Array(
+                'name'              => 'displayname',
+                'email'             => 'mailprimaryaddress',
+                'email:alias'       => 'alias',
             ),
-        'sort'                  => 'cn',
-        'scope'                 => 'sub',
-        'filter'                => '(objectClass=*)',
-        'fuzzy_search'          => true,
-        'sizelimit'             => '0',
-        'timelimit'             => '0',
-        'groups'                    => array(
+        'sort'                      => 'displayname',
+        'scope'                     => 'sub',
+        'filter'                    => '(objectClass=*)',
+        'fuzzy_search'              => true,
+        'sizelimit'                 => '0',
+        'timelimit'                 => '0',
+        'groups'                    => Array(
                 'base_dn'           => '@%@ldap/base@%@',
                 'filter'            => '(objectClass=kolabGroupOfNames)',
-                'object_classes'    => array('top', 'kolabGroupOfNames'),
+                'object_classes'    => Array('top', 'kolabGroupOfNames'),
                 'member_attr'       => 'member',
             ),
     );
 
-// This will overwrite defined filter
-$config'kolab_auth_filter' = '(&(objectClass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)(mailPrimaryAddress=%fu)))';
 
-// Use this fields (from fieldmap configuration) to get authentication ID
-$config'kolab_auth_login' = 'email';
+    // This will overwrite defined filter
+    $config'kolab_auth_filter' = '(&(objectClass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)(mailPrimaryAddress=%fu)))';
 
-// Use this fields (from fieldmap configuration) for default identity.
-// If the value array contains more than one field, first non-empty will be used
-// Note: These aren't LDAP attributes, but field names in config
-// Note: If there's more than one email address, as many identities will be created
-$config'kolab_auth_name'  = 'name';
-$config'kolab_auth_alias' = 'alias';
-$config'kolab_auth_email' = 'email';
+    // Use this fields (from fieldmap configuration) to get authentication ID
+    $config'kolab_auth_login' = 'email';
 
-// Login and password of the admin user. Enables "Login As" feature.
-$config'kolab_auth_admin_login'    = '';
-$config'kolab_auth_admin_password' = '';
+    // Use this fields (from fieldmap configuration) for default identity
+    // If the value array contains more than one field, first non-empty will be used
+    // Note: These aren't LDAP attributes, but field names in config
+    // Note: If there's more than one email address, as many identities will be created
+    $config'kolab_auth_name'  = 'name';
+    $config'kolab_auth_alias' = 'alias';
+    $config'kolab_auth_email' = 'email';
 
-// Enable audit logging for abuse of administrative privileges.
-$config'kolab_auth_auditlog' = false;
+    if (preg_match('/\/helpdesk-login\//', $_SERVER"REQUEST_URI") ) {
 
-// Role field (from fieldmap configuration)
-$config'kolab_auth_role' = '';
-// The required value for the role attribute to contain should the user be allowed
-// to login as another user.
-$config'kolab_auth_role_value' = '';
+        // Login and password of the admin user. Enables "Login As" feature.
+        $config'kolab_auth_admin_login'    = '';
+        $config'kolab_auth_admin_password' = '';
 
-// Administrative group name to which user must be assigned to
-// which adds privilege to login as another user.
-$config'kolab_auth_group' = '';
+        // Enable audit logging for abuse of administrative privileges.
+        $config'kolab_auth_auditlog' = true;
+    }
 
-// Enable plugins on a role-by-role basis. In this example, the 'acl' plugin
-// is enabled for people with a 'cn=professional-user,dc=mykolab,dc=ch' role.
-//
-// Note that this does NOT mean the 'acl' plugin is disabled for other people.
-$config'kolab_auth_role_plugins' = Array(
-        'cn=professional-user,dc=mykolab,dc=ch' => Array(
-                'acl',
-            ),
-    );
+    // Administrative role field (from fieldmap configuration) which must be filled with
+    // specified value which adds privilege to login as another user.
+    $config'kolab_auth_role'       = 'role';
+    // The required value for the role attribute to contain should the user be allowed
+    // to login as another user.
+    $config'kolab_auth_role_value' = '';
 
-// Settings on a role-by-role basis. In this example, the 'htmleditor' setting
-// is enabled(1) for people with a 'cn=professional-user,dc=mykolab,dc=ch' role,
-// and it cannot be overridden. Sample use-case: disable htmleditor for normal people,
-// do not allow the setting to be controlled through the preferences, enable the
-// html editor for professional users and allow them to override the setting in
-// the preferences.
-$config'kolab_auth_role_settings' = Array(
-        'cn=professional-user,dc=mykolab,dc=ch' => Array(
-                'htmleditor' => Array(
-                        'mode' => 'override',
-                        'value' => 1,
-                        'allow_override' => true
-                    ),
-            ),
-    );
+    // Administrative group name to which user must be assigned to
+    // which adds privilege to login as another user.
+    $config'kolab_auth_group' = 'Kolab Helpdesk';
+    
+    // Enable plugins on a role-by-role basis. In this example, the 'acl' plugin
+    // is enabled for people with a 'cn=professional-user,dc=mykolab,dc=ch' role.
+    //
+    // Note that this does NOT mean the 'acl' plugin is disabled for other people.
+    $config'kolab_auth_role_plugins' = Array(
+            'cn=professional-user,dc=mykolab,dc=ch' => Array(
+                    'acl',
+                ),
+        );
+    
+    // Settings on a role-by-role basis. In this example, the 'htmleditor' setting
+    // is enabled(1) for people with a 'cn=professional-user,dc=mykolab,dc=ch' role,
+    // and it cannot be overridden. Sample use-case: disable htmleditor for normal people,
+    // do not allow the setting to be controlled through the preferences, enable the
+    // html editor for professional users and allow them to override the setting in
+    // the preferences.
+    $config'kolab_auth_role_settings' = Array(
+            'cn=professional-user,dc=mykolab,dc=ch' => Array(
+                    'htmleditor' => Array(
+                            'mode' => 'override',
+                            'value' => 1,
+                            'allow_override' => true
+                        ),
+                ),
+        );
 
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . $_SERVER"HTTP_HOST" . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . $_SERVER"HTTP_HOST" . '/' . basename(__FILE__));
+    }
 
 ?>

kolab-16.0.0.tar.gz/ucs/conffiles/etc/roundcubemail/kolab_delegation.inc.php Added

@@ -0,0 +1,29 @@
+<?php
+
+@%@UCRWARNING=// @%@
+
+    // This will overwrite defined LDAP filter
+    // Note: LDAP addressbook defined for kolab_auth plugin is used
+    $config'kolab_delegation_filter' = '(|(objectClass=kolabInetOrgPerson)(objectclass=kolabsharedfolder))';
+
+    // Delegates field (from fieldmap configuration) to get delegates list
+    // Note: This is a field name, not LDAP attribute name
+    // Note: LDAP addressbook defined for kolab_auth plugin is used
+    $config'kolab_delegation_delegate_field' = 'kolabDelegate';
+
+    // User authentication ID field (from fieldmap configuration)
+    // See kolab_auth plugin config
+    $config'kolab_delegation_login_field' = 'email';
+
+    // Use this fields (from fieldmap configuration) for identities
+    // If the value array contains more than one field, first non-empty will be used
+    // Note: These are not LDAP attributes, but field names in config
+    // Note: If there are more than one email address, as many identities will be created
+    // See kolab_auth plugin config
+    $config'kolab_delegation_name_field'  = array('name', 'cn');
+    $config'kolab_delegation_email_field' = array('email');
+
+    // Remove all user identities which do not match the users primary or alias
+    // addresses and delegators addresses
+    $config'kolab_delegation_purge_identities' = false;
+?>

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/kolab_files.inc.php -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/roundcubemail/kolab_files.inc.php Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/kolab_folders.inc.php -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/roundcubemail/kolab_folders.inc.php Changed

@@ -1,38 +1,30 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
-// Default kolab-specific folders. Set values to non-empty
-// strings to create default folders of apropriate type.
-// If there is no default folder with specified type in user mailbox,
-// it will be created.
-// Note: Mail folders will be also subscribed.
+    // Default kolab-specific folders. Set values to non-empty
+    // strings to create default folders of apropriate type.
+    // If there is no default folder with specified type in user mailbox,
+    // it will be created.
+    // Note: Mail folders will be also subscribed.
 
-// Default Configuration folder
-$config'kolab_folders_configuration_default' = 'Configuration';
-// Default Calendar folder
-$config'kolab_folders_event_default' = 'Kalender';
-// Default Contacts (Addressbook) folder
-$config'kolab_folders_contact_default' = 'Kontakte';
-// Default Tasks folder
-$config'kolab_folders_task_default' = '';
-// Default Notes folder
-$config'kolab_folders_note_default' = '';
-// Default Journal folder
-$config'kolab_folders_journal_default' = '';
+    $config'kolab_folders_configuration_default' = 'Configuration';
+    $config'kolab_folders_event_default' = 'Calendar';
+    $config'kolab_folders_contact_default' = 'Contacts';
+    $config'kolab_folders_task_default' = 'Tasks';
+    $config'kolab_folders_note_default' = 'Notes';
+    $config'kolab_folders_file_default' = 'Files';
+    $config'kolab_folders_freebusy_default' = 'Freebusy';
+    $config'kolab_folders_journal_default' = 'Journal';
+    $config'kolab_folders_mail_inbox' = 'INBOX';
+    $config'kolab_folders_mail_drafts' = 'Drafts';
+    $config'kolab_folders_mail_sentitems' = 'Sent';
+    $config'kolab_folders_mail_junkemail' = 'Spam';
+    $config'kolab_folders_mail_outbox' = '';
+    $config'kolab_folders_mail_wastebasket' = 'Trash';
 
-// INBOX folder
-$config'kolab_folders_mail_inbox' = 'INBOX';
-// Drafts folder
-$config'kolab_folders_mail_drafts' = 'Drafts';
-// Sent folder
-$config'kolab_folders_mail_sentitems' = 'Sent';
-// Trash folder
-$config'kolab_folders_mail_wastebasket' = 'Trash';
-// Others folders
-$config'kolab_folders_mail_outbox' = '';
-$config'kolab_folders_mail_junkemail' = '';
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . $_SERVER"HTTP_HOST" . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . $_SERVER"HTTP_HOST" . '/' . basename(__FILE__));
+    }
 
 ?>

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/ldap_authentication.inc.php -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/roundcubemail/ldap_authentication.inc.php Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/libkolab.inc.php -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/roundcubemail/libkolab.inc.php Changed

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/managesieve.inc.php -> kolab-16.0.0.tar.gz/ucs/conffiles/etc/roundcubemail/managesieve.inc.php Changed

@@ -1,12 +1,10 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
 // managesieve server port. When empty the port will be determined automatically
 // using getservbyname() function, with 4190 as a fallback.
-$config'managesieve_port' = null;
+    $config'managesieve_port' = 4190;
 
 // managesieve server address, default is localhost.
 // Replacement variables supported in host name:
@@ -18,56 +16,60 @@
 
 // authentication method. Can be CRAM-MD5, DIGEST-MD5, PLAIN, LOGIN, EXTERNAL
 // or none. Optional, defaults to best method supported by server.
-$config'managesieve_auth_type' = null;
+    $config'managesieve_auth_type' = 'PLAIN';
 
 // Optional managesieve authentication identifier to be used as authorization proxy.
 // Authenticate as a different user but act on behalf of the logged in user.
 // Works with PLAIN and DIGEST-MD5 auth.
-$config'managesieve_auth_cid' = null;
+    $config'managesieve_auth_cid' = null;
 
 // Optional managesieve authentication password to be used for imap_auth_cid
-$config'managesieve_auth_pw' = null;
+    $config'managesieve_auth_pw' = null;
 
 // use or not TLS for managesieve server connection
 // Note: tls:// prefix in managesieve_host is also supported
 // it's because I've problems with TLS and dovecot's managesieve plugin
 // and it's not needed on localhost
-$config'managesieve_usetls' = true;
+    $config'managesieve_usetls' = true;
 
 // default contents of filters script (eg. default spam filter)
-$config'managesieve_default' = '/etc/dovecot/sieve/global';
+    $config'managesieve_default' = '/etc/dovecot/sieve/global';
 
 // The name of the script which will be used when there's no user script
-$config'managesieve_script_name' = 'roundcube';
+    $config'managesieve_script_name' = 'roundcube';
 
 // Sieve RFC says that we should use UTF-8 endcoding for mailbox names,
 // but some implementations does not covert UTF-8 to modified UTF-7.
 // Defaults to UTF7-IMAP
-$config'managesieve_mbox_encoding' = 'UTF-8';
+    $config'managesieve_mbox_encoding' = 'UTF-8';
 
 // I need this because my dovecot (with listescape plugin) uses
 // ':' delimiter, but creates folders with dot delimiter
-$config'managesieve_replace_delimiter' = '';
+    $config'managesieve_replace_delimiter' = '';
 
 // disabled sieve extensions (body, copy, date, editheader, encoded-character,
 // envelope, environment, ereject, fileinto, ihave, imap4flags, index,
 // mailbox, mboxmetadata, regex, reject, relational, servermetadata,
 // spamtest, spamtestplus, subaddress, vacation, variables, virustest, etc.
 // Note: not all extensions are implemented
-$config'managesieve_disabled_extensions' = array();
+    $config'managesieve_disabled_extensions' = array();
 
 // Enables debugging of conversation with sieve server. Logs it into <log_dir>/sieve
-$config'managesieve_debug' = false;
+    $config'managesieve_debug' = true;
 
 // Enables features described in http://wiki.kolab.org/KEP:14
-$config'managesieve_kolab_master' = true;
+    $config'managesieve_kolab_master' = true;
 
 // Script name extension used for scripts including. Dovecot uses '.sieve',
 // Cyrus uses '.siv'. Doesn't matter if you have managesieve_kolab_master disabled.
-$config'managesieve_filename_extension' = '';
+    $config'managesieve_filename_extension' = '';
 
 // List of reserved script names (without extension).
 // Scripts listed here will be not presented to the user.
-$config'managesieve_filename_exceptions' = array('MASTER', 'MANAGEMENT', 'USER');
+    $config'managesieve_filename_exceptions' = array('MASTER', 'MANAGEMENT', 'USER');
+
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . $_SERVER"HTTP_HOST" . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . $_SERVER"HTTP_HOST" . '/' . basename(__FILE__));
+    }
 
 ?>

kolab-3.1.9.tar.gz/ucs/debian/kolab-imap.dirs -> kolab-16.0.0.tar.gz/ucs/debian/kolab-imap.dirs Changed

kolab-3.1.9.tar.gz/ucs/debian/kolab-imap.install -> kolab-16.0.0.tar.gz/ucs/debian/kolab-imap.install Changed

kolab-3.1.9.tar.gz/ucs/debian/kolab-imap.postinst -> kolab-16.0.0.tar.gz/ucs/debian/kolab-imap.postinst Changed

kolab-16.0.0.tar.gz/ucs/debian/kolab-imap.postrm Added

kolab-3.1.9.tar.gz/ucs/debian/kolab-imap.preinst -> kolab-16.0.0.tar.gz/ucs/debian/kolab-imap.preinst Changed

kolab-3.1.9.tar.gz/ucs/debian/kolab-imap.prerm -> kolab-16.0.0.tar.gz/ucs/debian/kolab-imap.prerm Changed

kolab-3.1.9.tar.gz/ucs/debian/kolab-imap.univention-config-registry -> kolab-16.0.0.tar.gz/ucs/debian/kolab-imap.univention-config-registry Changed

kolab-3.1.9.tar.gz/ucs/debian/kolab-mta.dirs -> kolab-16.0.0.tar.gz/ucs/debian/kolab-mta.dirs Changed

kolab-3.1.9.tar.gz/ucs/debian/kolab-mta.install -> kolab-16.0.0.tar.gz/ucs/debian/kolab-mta.install Changed

kolab-3.1.9.tar.gz/ucs/debian/kolab-mta.postinst -> kolab-16.0.0.tar.gz/ucs/debian/kolab-mta.postinst Changed

kolab-16.0.0.tar.gz/ucs/debian/kolab-mta.postrm Added

kolab-3.1.9.tar.gz/ucs/debian/kolab-mta.preinst -> kolab-16.0.0.tar.gz/ucs/debian/kolab-mta.preinst Changed

kolab-16.0.0.tar.gz/ucs/debian/kolab-mta.prerm Added

kolab-3.1.9.tar.gz/ucs/debian/kolab-mta.univention-config-registry -> kolab-16.0.0.tar.gz/ucs/debian/kolab-mta.univention-config-registry Changed

@@ -44,6 +44,7 @@
 Variables: mail/postfix/inet/interfaces
 Variables: mail/postfix/inet/protocols
 Variables: mail/smtp/VRFY/disabled
+Variables: mail/postfix/smtpd/banner
 
 Type: subfile
 Multifile: etc/postfix/main.cf
@@ -59,18 +60,20 @@
 Type: subfile
 Multifile: etc/postfix/main.cf
 Subfile: etc/postfix/main.cf.d/50_restrictions
+Variables: mail/kolab/smtp_access_policy
 Variables: mail/postfix/greylisting
 
 Type: subfile
 Multifile: etc/postfix/main.cf
 Subfile: etc/postfix/main.cf.d/60_tls
 Variables: mail/postfix/ssl/certificate
-Variables: mail/postfix/ssl/key
 Variables: mail/postfix/tls/client/level
+Variables: mail/postfix/ssl/key
 
 Type: subfile
 Multifile: etc/postfix/main.cf
 Subfile: etc/postfix/main.cf.d/80_delivery
+Variables: mail/archivefolder
 
 Type: multifile
 Multifile: etc/postfix/master.cf
@@ -89,6 +92,7 @@
 Type: subfile
 Multifile: etc/postfix/master.cf
 Subfile: etc/postfix/master.cf.d/10_services
+Variables: mail/kolab/smtp_access_policy
 
 Type: subfile
 Multifile: etc/postfix/master.cf
@@ -102,6 +106,7 @@
 Variables: ldap/base
 Variables: ldap/server/name
 Variables: ldap/server/port
+Variables: mail/kolab/smtp_access_policy
 
 Type: multifile
 Multifile: etc/postfix/transport
@@ -109,7 +114,10 @@
 Type: subfile
 Multifile: etc/postfix/transport
 Subfile: etc/postfix/transport.d/10_base
+Variables: domainname
+Variables: mail/hosteddomains
 Variables: mail/maps/transport/.*
+Variables: mail/relayhost
 
 Type: file
 File: etc/mailname
@@ -146,6 +154,10 @@
 Type: subfile
 Multifile: etc/postfix/ldap.groups
 Subfile: etc/postfix/ldap.groups.d/10_base
+Variables: mail/postfix/ldaptable/tlscacertfile
+Variables: mail/postfix/ldaptable/debuglevel
+Variables: mail/postfix/ldaptable/starttls
+Variables: mail/postfix/ldaptable/tlsrequirecert
 
 Type: multifile
 Multifile: etc/postfix/ldap.transportlocal
@@ -157,6 +169,10 @@
 Type: subfile
 Multifile: etc/postfix/ldap.transportlocal
 Subfile: etc/postfix/ldap.transportlocal.d/10_base
+Variables: mail/postfix/ldaptable/tlscacertfile
+Variables: mail/postfix/ldaptable/debuglevel
+Variables: mail/postfix/ldaptable/starttls
+Variables: mail/postfix/ldaptable/tlsrequirecert
 
 Type: multifile
 Multifile: etc/postfix/ldap.transportremote
@@ -168,6 +184,10 @@
 Type: subfile
 Multifile: etc/postfix/ldap.transportremote
 Subfile: etc/postfix/ldap.transportremote.d/10_base
+Variables: mail/postfix/ldaptable/tlscacertfile
+Variables: mail/postfix/ldaptable/debuglevel
+Variables: mail/postfix/ldaptable/starttls
+Variables: mail/postfix/ldaptable/tlsrequirecert
 
 Type: multifile
 Multifile: etc/postfix/ldap.virtualwithcanonical
@@ -179,6 +199,10 @@
 Type: subfile
 Multifile: etc/postfix/ldap.virtualwithcanonical
 Subfile: etc/postfix/ldap.virtualwithcanonical.d/10_base
+Variables: mail/postfix/ldaptable/tlscacertfile
+Variables: mail/postfix/ldaptable/debuglevel
+Variables: mail/postfix/ldaptable/starttls
+Variables: mail/postfix/ldaptable/tlsrequirecert
 
 Type: multifile
 Multifile: etc/postfix/ldap.sharedfolderremote
@@ -190,6 +214,10 @@
 Type: subfile
 Multifile: etc/postfix/ldap.sharedfolderremote
 Subfile: etc/postfix/ldap.sharedfolderremote.d/10_base
+Variables: mail/postfix/ldaptable/tlscacertfile
+Variables: mail/postfix/ldaptable/debuglevel
+Variables: mail/postfix/ldaptable/starttls
+Variables: mail/postfix/ldaptable/tlsrequirecert
 
 Type: multifile
 Multifile: etc/postfix/ldap.virtual
@@ -201,6 +229,10 @@
 Type: subfile
 Multifile: etc/postfix/ldap.virtual
 Subfile: etc/postfix/ldap.virtual.d/10_base
+Variables: mail/postfix/ldaptable/tlscacertfile
+Variables: mail/postfix/ldaptable/debuglevel
+Variables: mail/postfix/ldaptable/starttls
+Variables: mail/postfix/ldaptable/tlsrequirecert
 
 Type: multifile
 Multifile: etc/postfix/ldap.virtualdomains
@@ -212,6 +244,10 @@
 Type: subfile
 Multifile: etc/postfix/ldap.virtualdomains
 Subfile: etc/postfix/ldap.virtualdomains.d/10_base
+Variables: mail/postfix/ldaptable/tlscacertfile
+Variables: mail/postfix/ldaptable/debuglevel
+Variables: mail/postfix/ldaptable/starttls
+Variables: mail/postfix/ldaptable/tlsrequirecert
 
 Type: multifile
 Multifile: etc/postfix/ldap.sharedfolderlocal
@@ -223,6 +259,10 @@
 Type: subfile
 Multifile: etc/postfix/ldap.sharedfolderlocal
 Subfile: etc/postfix/ldap.sharedfolderlocal.d/10_base
+Variables: mail/postfix/ldaptable/tlscacertfile
+Variables: mail/postfix/ldaptable/debuglevel
+Variables: mail/postfix/ldaptable/starttls
+Variables: mail/postfix/ldaptable/tlsrequirecert
 
 Type: multifile
 Multifile: etc/postfix/ldap.canonicalrecipient
@@ -234,6 +274,10 @@
 Type: subfile
 Multifile: etc/postfix/ldap.canonicalrecipient
 Subfile: etc/postfix/ldap.canonicalrecipient.d/10_base
+Variables: mail/postfix/ldaptable/tlscacertfile
+Variables: mail/postfix/ldaptable/debuglevel
+Variables: mail/postfix/ldaptable/starttls
+Variables: mail/postfix/ldaptable/tlsrequirecert
 
 Type: multifile
 Multifile: etc/postfix/ldap.distlist
@@ -245,6 +289,10 @@
 Type: subfile
 Multifile: etc/postfix/ldap.distlist
 Subfile: etc/postfix/ldap.distlist.d/10_base
+Variables: mail/postfix/ldaptable/tlscacertfile
+Variables: mail/postfix/ldaptable/debuglevel
+Variables: mail/postfix/ldaptable/starttls
+Variables: mail/postfix/ldaptable/tlsrequirecert
 
 Type: multifile
 Multifile: etc/postfix/ldap.canonicalsender
@@ -256,3 +304,7 @@
 Type: subfile
 Multifile: etc/postfix/ldap.canonicalsender
 Subfile: etc/postfix/ldap.canonicalsender.d/10_base
+Variables: mail/postfix/ldaptable/tlscacertfile
+Variables: mail/postfix/ldaptable/debuglevel
+Variables: mail/postfix/ldaptable/starttls
+Variables: mail/postfix/ldaptable/tlsrequirecert

kolab-3.1.9.tar.gz/ucs/debian/kolab-mta.univention-config-registry-variables -> kolab-16.0.0.tar.gz/ucs/debian/kolab-mta.univention-config-registry-variables Changed

@@ -183,3 +183,27 @@
 Descriptionen=List of protocols activated in postfix (Valid values: "all", "ipv4", "ipv6", "ipv4, ipv6"; Default: "ipv4")
 Type=str
 Categories=service-mail
+
+mail/postfix/ldaptable/starttls
+Descriptionde=Ist diese Option aktiviert, verwendet Postfix eine verschlüsselte Verbindung für LDAP-Suchen.
+Descriptionen=If this option is activated, Postfix uses an encrypted connection for ldap lookups.
+Type=bool
+Categories=service-mail
+
+mail/postfix/ldaptable/tlsrequirecert
+Descriptionde=Ist diese Option aktiviert, wird beim Aufbau einer SSL/TLS Verbindung die Gültigkeit des X509 Zertifikat des Server geprüft.
+Descriptionen=Whether or not to request the server's X509 certificate and check its validity when establishing SSL/TLS connections.
+Type=bool
+Categories=service-mail
+
+mail/postfix/ldaptable/tlscacertfile
+Descriptionde=Datei mit den X509 CA-Zertifikaten in PEM Format für Validierung der SSL/TLS Verbindungen.
+Descriptionen=File containing the X509 CA certificates in PEM format which are to be recognized by the client in SSL/TLS connections.
+Type=str
+Categories=service-mail
+
+mail/postfix/ldaptable/debuglevel
+Descriptionde=Debug-Level für OpenLDAP Operationen.
+Descriptionen=What level to set for debugging in the OpenLDAP libraries.
+Type=int
+Categories=service-mail

kolab-3.1.9.tar.gz/ucs/debian/kolab-ucs.dirs -> kolab-16.0.0.tar.gz/ucs/debian/kolab-ucs.dirs Changed

kolab-3.1.9.tar.gz/ucs/debian/kolab-ucs.install -> kolab-16.0.0.tar.gz/ucs/debian/kolab-ucs.install Changed

kolab-3.1.9.tar.gz/ucs/debian/kolab-ucs.postinst -> kolab-16.0.0.tar.gz/ucs/debian/kolab-ucs.postinst Changed

@@ -33,60 +33,49 @@
 
 #DEBHELPER#
 
-if  ! -d /usr/share/univention-admin/www ; then
-	mkdir -p /usr/share/univention-admin/www
-fi
-
-eval "$(univention-config-registry shell)"
-
-univention-config-registry set mail/antivir/spam?yes
-if  "$1" = configure -a -n "$2"  && dpkg --compare-versions "$2" lt 0.1-10; then
-	univention-config-registry set mail/cyrus/caluser?kolab2cal@$domainname
-	univention-config-registry set mail/cyrus/caluser/pwdfile?/etc/kolab2cal.secret
-elif  -z "$2" ; then
-	univention-config-registry set mail/cyrus/caluser?kolab2cal@$domainname
-	univention-config-registry set mail/cyrus/caluser/pwdfile?/etc/kolab2cal.secret
-fi
-
-if  "$server_role" = "domaincontroller_master" -o "$server_role" = "domaincontroller_backup" ; then
-	/usr/lib/univention-install/65kolab-ucs.inst || true
-	mail=`univention-admin settings/usertemplate list --filter="cn=$domainname Groupware Account" | grep ' e-mail:' | sed 's/^:*: //;s/^None$//'`
-	shell=`univention-admin settings/usertemplate list --filter="cn=$domainname Groupware Account" | grep ' shell:' | sed 's/^:*: //;s/^None$//'`
-	unixhome=`univention-admin settings/usertemplate list --filter="cn=$domainname Groupware Account" | grep ' unixhome:' | sed 's/^:*: //;s/^\/home\/$//'`
-	if  -z "$mail" -o -z "$shell" -o -z "$unixhome" ; then
-		univention-admin 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>"
-	fi
-	# remove old '$hostname.$domainname Groupware Account' template (#1606)
-	univention-admin settings/usertemplate remove --dn "$hostname.$domainname Groupware Account,cn=templates,cn=univention,${ldap_base}" > /dev/null || true
-fi
-
-if  ! -e "/etc/cyrus.secret" ; then
-    touch /etc/cyrus.secret
-    chmod 600 /etc/cyrus.secret
-    chown cyrus:root /etc/cyrus.secret
-    makepasswd --nocrypt > /etc/cyrus.secret
-fi
-
-if  "${server_role}" = "domaincontroller_master" ; then
-    univention-directory-manager users/user create \
-        --set password=$(cat /etc/cyrus.secret) \
-        --set "username=cyrus-admin" \
-        --set "firstname=Cyrus" \
-        --set "lastname=Administrator" \
-        --position "cn=users,${ldap_base}"
-fi
-
-ucr commit /etc/apt/preferences.d/kolab.pref
-ucr commit /etc/apt/sources.list.d/kolab.list
-
-if  -x /etc/init.d/univention-directory-listener ; then
-	/etc/init.d/univention-directory-listener restart
-fi
-
-if  -z "$postfix_autostart"  ||  "$postfix_autostart" = "yes" ; then
-	if  -x /etc/init.d/postfix ; then
-	    /etc/init.d/postfix restart
-	fi
-fi
+case $1 in
+    configure)
+        . /usr/share/univention-lib/all.sh
+        
+        eval "$(ucr shell)"
+        
+        ucr set mail/antivir/spam?yes
+        if  "$1" = configure -a -n "$2"  && dpkg --compare-versions "$2" lt 0.1-10; then
+            ucr set mail/cyrus/caluser?kolab2cal@$domainname
+            ucr set mail/cyrus/caluser/pwdfile?/etc/kolab2cal.secret
+        elif  -z "$2" ; then
+            ucr set mail/cyrus/caluser?kolab2cal@$domainname
+            ucr set mail/cyrus/caluser/pwdfile?/etc/kolab2cal.secret
+        fi
+        
+        if  ! -e "/etc/cyrus.secret" ; then
+            touch /etc/cyrus.secret
+            chmod 600 /etc/cyrus.secret
+            chown cyrus:root /etc/cyrus.secret
+            makepasswd --nocrypt > /etc/cyrus.secret
+        fi
+        
+        # remove unjoin script if present
+        uinst=/usr/lib/univention-install/65kolab-ucs.uinst
+         -e "$uinst"  && rm "$uinst"
+        
+        # call join script
+        call_joinscript 65kolab-ucs.inst
+        
+        ucr commit /etc/apt/preferences.d/kolab.pref
+        ucr commit /etc/apt/sources.list.d/kolab.list
+        
+        if  -x /etc/init.d/univention-directory-listener ; then
+            /etc/init.d/univention-directory-listener restart
+        fi
+        
+        if  -z "$postfix_autostart"  ||  "$postfix_autostart" = "yes" ; then
+            if  -x /etc/init.d/postfix ; then
+                /etc/init.d/postfix restart
+            fi
+        fi
+   
+    ;;
+esac
 
 exit 0

kolab-16.0.0.tar.gz/ucs/debian/kolab-ucs.postrm Added

kolab-3.1.9.tar.gz/ucs/debian/kolab-ucs.preinst -> kolab-16.0.0.tar.gz/ucs/debian/kolab-ucs.preinst Changed

kolab-16.0.0.tar.gz/ucs/debian/kolab-ucs.prerm Added

kolab-3.1.9.tar.gz/ucs/debian/kolab-ucs.univention-config-registry -> kolab-16.0.0.tar.gz/ucs/debian/kolab-ucs.univention-config-registry Changed

kolab-3.1.9.tar.gz/ucs/debian/kolab-webclient.dirs -> kolab-16.0.0.tar.gz/ucs/debian/kolab-webclient.dirs Changed

kolab-3.1.9.tar.gz/ucs/debian/kolab-webclient.install -> kolab-16.0.0.tar.gz/ucs/debian/kolab-webclient.install Changed

kolab-3.1.9.tar.gz/ucs/debian/kolab-webclient.postinst -> kolab-16.0.0.tar.gz/ucs/debian/kolab-webclient.postinst Changed

kolab-16.0.0.tar.gz/ucs/debian/kolab-webclient.postrm Added

kolab-16.0.0.tar.gz/ucs/debian/kolab-webclient.prerm Added

kolab-3.1.9.tar.gz/ucs/debian/kolab-webclient.univention-config-registry -> kolab-16.0.0.tar.gz/ucs/debian/kolab-webclient.univention-config-registry Changed

@@ -9,6 +9,18 @@
 Mode: 0640
 
 Type: file
+File: etc/roundcubemail/acl.inc.php
+User: root
+Group: www-data
+Mode: 0640
+
+Type: file
+File: etc/roundcubemail/calendar.inc.php
+User: root
+Group: www-data
+Mode: 0640
+
+Type: file
 File: etc/roundcubemail/config.inc.php
 Variables: domainname
 Variables: hostname
@@ -29,36 +41,6 @@
 Mode: 0640
 
 Type: file
-File: etc/roundcubemail/mimetypes.php
-User: root
-Group: www-data
-Mode: 0640
-
-Type: file
-File: etc/roundcubemail/acl.inc.php
-User: root
-Group: www-data
-Mode: 0640
-
-Type: file
-File: etc/roundcubemail/calendar.inc.php
-User: root
-Group: www-data
-Mode: 0640
-
-Type: file
-File: etc/roundcubemail/compose_addressbook.inc.php
-User: root
-Group: www-data
-Mode: 0640
-
-Type: file
-File: etc/roundcubemail/importmessages.inc.php
-User: root
-Group: www-data
-Mode: 0640
-
-Type: file
 File: etc/roundcubemail/jqueryui.inc.php
 User: root
 Group: www-data
@@ -81,7 +63,7 @@
 Mode: 0640
 
 Type: file
-File: etc/roundcubemail/kolab_folders.inc.php
+File: etc/roundcubemail/kolab_delegation.inc.php
 User: root
 Group: www-data
 Mode: 0640
@@ -94,8 +76,7 @@
 Mode: 0640
 
 Type: file
-File: etc/roundcubemail/libkolab.inc.php
-Variables: mail/kolab/format-mime-version
+File: etc/roundcubemail/kolab_folders.inc.php
 User: root
 Group: www-data
 Mode: 0640
@@ -107,22 +88,14 @@
 Mode: 0640
 
 Type: file
-File: etc/roundcubemail/managesieve.inc.php
+File: etc/roundcubemail/libkolab.inc.php
+Variables: mail/kolab/format-mime-version
 User: root
 Group: www-data
 Mode: 0640
 
-Type: multifile
-Multifile: var/www/ucs-overview/de.html
-
-Type: subfile
-Multifile: var/www/ucs-overview/de.html
-Subfile: var/www/ucs-overview/de.html.d/50kolab-webclient-de.html
-
-Type: multifile
-Multifile: var/www/ucs-overview/en.html
-
-Type: subfile
-Multifile: var/www/ucs-overview/en.html
-Subfile: var/www/ucs-overview/en.html.d/50kolab-webclient-en.html
-
+Type: file
+File: etc/roundcubemail/managesieve.inc.php
+User: root
+Group: www-data
+Mode: 0640

kolab-3.1.9.tar.gz/ucs/kolab-imap-join-script.sh -> kolab-16.0.0.tar.gz/ucs/kolab-imap-join-script.sh Changed

@@ -1,4 +1,34 @@
 #!/bin/sh
+#
+# Kolab Systems Cyrus Mail Server
+#  join script
+#
+# Copyright 2012-2015 Kolab Systems AG
+#
+# http://www.kolabsystems.com/
+#
+# All rights reserved.
+#
+# The source code of this program is made available
+# under the terms of the GNU Affero General Public License version 3
+# (GNU AGPL V3) as published by the Free Software Foundation.
+#
+# Binary versions of this program provided by Univention to you as
+# well as other copyrighted, protected or trademarked materials like
+# Logos, graphics, fonts, specific documentations and configurations,
+# cryptographic keys etc. are subject to a license agreement between
+# you and Univention and not subject to the GNU AGPL V3.
+#
+# In the case you use this program under the terms of the GNU AGPL V3,
+# the program is provided in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License with the Debian GNU/Linux or Univention distribution in file
+# /usr/share/common-licenses/AGPL-3; if not, see
+# <http://www.gnu.org/licenses/>.
 
 VERSION=3
 
@@ -49,6 +79,7 @@
         --set "username=cyrus-admin" \
         --set "firstname=Cyrus" \
         --set "lastname=Administrator" \
+        --set "objectFlag=functional" \
         --position "cn=users,${ldap_base}" \
         >/dev/null 2>&1 && echo "OK" || echo "FAIL"
 fi

kolab-3.1.9.tar.gz/ucs/kolab-imap-passwd-change.sh -> kolab-16.0.0.tar.gz/ucs/kolab-imap-passwd-change.sh Changed

kolab-16.0.0.tar.gz/ucs/kolab-imap-unjoin-script.sh Added

@@ -0,0 +1,59 @@
+#!/bin/sh
+#
+# Kolab Systems Postfix Mail Server
+#  unjoin script
+#
+# Copyright 2015 Kolab Systems AG
+#
+# http://www.kolabsystems.com/
+#
+# All rights reserved.
+#
+# The source code of this program is made available
+# under the terms of the GNU Affero General Public License version 3
+# (GNU AGPL V3) as published by the Free Software Foundation.
+#
+# Binary versions of this program provided by Univention to you as
+# well as other copyrighted, protected or trademarked materials like
+# Logos, graphics, fonts, specific documentations and configurations,
+# cryptographic keys etc. are subject to a license agreement between
+# you and Univention and not subject to the GNU AGPL V3.
+#
+# In the case you use this program under the terms of the GNU AGPL V3,
+# the program is provided in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License with the Debian GNU/Linux or Univention distribution in file
+# /usr/share/common-licenses/AGPL-3; if not, see
+# <http://www.gnu.org/licenses/>.
+
+VERSION=1
+
+. /usr/share/univention-lib/all.sh
+. /usr/share/univention-join/joinscripthelper.lib
+joinscript_init
+
+eval "$(ucr shell)"
+
+# de-configure firewall (configured in postinst)
+ucr unset security/packetfilter/package/kolab-imap/tcp/110/all \
+	security/packetfilter/package/kolab-imap/tcp/110/all/en \
+	security/packetfilter/package/kolab-imap/tcp/143/all \
+	security/packetfilter/package/kolab-imap/tcp/143/all/en \
+	security/packetfilter/package/kolab-imap/tcp/993/all \
+	security/packetfilter/package/kolab-imap/tcp/993/all/en \
+	security/packetfilter/package/kolab-imap/tcp/995/all \
+	security/packetfilter/package/kolab-imap/tcp/995/all/en \
+	security/packetfilter/package/kolab-imap/tcp/4190/all \
+	security/packetfilter/package/kolab-imap/tcp/4190/all/en
+ -x "/etc/init.d/univention-firewall"  && invoke-rc.d univention-firewall restart
+        
+# remove service from my host object
+ucs_removeServiceFromLocalhost "IMAP" "$@"
+
+joinscript_remove_script_from_status_file kolab-imap
+
+exit 0

kolab-3.1.9.tar.gz/ucs/kolab-mta-join-script.sh -> kolab-16.0.0.tar.gz/ucs/kolab-mta-join-script.sh Changed

kolab-16.0.0.tar.gz/ucs/kolab-mta-unjoin-script.sh Added

@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# Kolab Systems Postfix Mail Server
+#  unjoin script
+#
+# Copyright 2015 Kolab Systems AG
+#
+# http://www.kolabsystems.com/
+#
+# All rights reserved.
+#
+# The source code of this program is made available
+# under the terms of the GNU Affero General Public License version 3
+# (GNU AGPL V3) as published by the Free Software Foundation.
+#
+# Binary versions of this program provided by Univention to you as
+# well as other copyrighted, protected or trademarked materials like
+# Logos, graphics, fonts, specific documentations and configurations,
+# cryptographic keys etc. are subject to a license agreement between
+# you and Univention and not subject to the GNU AGPL V3.
+#
+# In the case you use this program under the terms of the GNU AGPL V3,
+# the program is provided in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License with the Debian GNU/Linux or Univention distribution in file
+# /usr/share/common-licenses/AGPL-3; if not, see
+# <http://www.gnu.org/licenses/>.
+
+VERSION=1
+
+. /usr/share/univention-lib/all.sh
+. /usr/share/univention-join/joinscripthelper.lib
+joinscript_init
+
+eval "$(ucr shell)"
+
+# de-configure firewall (configured in postinst)
+ucr set security/packetfilter/package/kolab-mta/tcp/25/all \
+	security/packetfilter/package/kolab-mta/tcp/25/all/en \
+	security/packetfilter/package/kolab-mta/tcp/465/all \
+	security/packetfilter/package/kolab-mta/tcp/465/all/en \
+	security/packetfilter/package/kolab-mta/tcp/587/all \
+	security/packetfilter/package/kolab-mta/tcp/587/all/en
+ -x "/etc/init.d/univention-firewall"  && invoke-rc.d univention-firewall restart
+
+# remove service from my host object
+ucs_removeServiceFromLocalhost "SMTP" "$@"
+
+joinscript_remove_script_from_status_file kolab-mta
+
+exit 0

kolab-16.0.0.tar.gz/ucs/kolab-ucs-hookKolabEnabled.py Added

@@ -0,0 +1,110 @@
+#!/usr/bin/python2.7
+#
+# Copyright (C) 2015 Kolab Systems AG
+#
+# http://kolabsystems.com/
+#
+# All rights reserved.
+#
+# source code of this program is made available
+# under the terms of the GNU Affero General Public License version 3
+# (GNU AGPL V3) as published by the Free Software Foundation.
+#
+# Binary versions of this program provided by Univention to you as
+# well as other copyrighted, protected or trademarked materials like
+# Logos, graphics, fonts, specific documentations and configurations,
+# cryptographic keys etc. are subject to a license agreement between
+# you and Univention and not subject to the GNU AGPL V3.
+#
+# In the case you use this program under the terms of the GNU AGPL V3,
+# the program is provided in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License with the Debian GNU/Linux or Univention distribution in file
+# /usr/share/common-licenses/AGPL-3. If not, see <http://www.gnu.org/licenses/>.
+
+from univention.admin.hook import simpleHook
+import univention.debug as ud
+
+VALUE_ENABLED = '1'
+NAME_OBJECTCLASS = 'kolabInetOrgPerson'
+NAME_ATTRIBUTE = 'kolabDummyAttribute'
+NAME_PROPERTY = 'KolabEnabled'
+REMOVE_ATTRIBUTES = 
+	'KolabForwardAddress',
+	'KolabForwardActive',
+	'KolabForwardKeepCopy',
+	'KolabForwardUCE',
+	'KolabVacationText',
+	'KolabVacationActive',
+	'KolabVacationAddress',
+	'KolabVacationNoReactDomain',
+	'KolabDeliveryToFolderName',
+	'KolabDeliveryToFolderActive',
+
+
+import pprint
+
+class hookKolabEnabled(simpleHook):
+
+	def hook_open(self, module):
+		ud.debug(ud.ADMIN, ud.ALL, 'admin.hook.hookKolabEnabled: _open called')
+
+		if NAME_OBJECTCLASS in module.oldattr.get('objectClass', ):
+			moduleNAME_PROPERTY = VALUE_ENABLED
+		ud.debug(ud.ADMIN, ud.ALL, 'admin.hook.hookKolabEnabled: _open (value=%r)' % moduleNAME_PROPERTY)
+
+	def hook_ldap_addlist(self, module, al=):
+		ud.debug(ud.ADMIN, ud.ALL, 'admin.hook.hookKolabEnabled.addlist (value=%r)' % moduleNAME_PROPERTY)
+		if moduleNAME_PROPERTY == VALUE_ENABLED:
+			al.append(('objectClass', '', NAME_OBJECTCLASS))
+		for item in al::
+			if item0 == NAME_ATTRIBUTE:
+				al.remove(item)
+		ud.debug(ud.ADMIN, ud.ALL, 'admin.hook.hookKolabEnabled.addlist\n al = %s' % pprint.PrettyPrinter(indent=4).pformat(al))
+		return al
+
+	def hook_ldap_modlist(self, module, ml=):
+		"""Add or remove objectClass when UDM checkbox is enabled or disabled."""
+		ud.debug(ud.ADMIN, ud.ALL, 'admin.hook.hookKolabEnabled.modlist (value=%r)' % moduleNAME_PROPERTY)
+
+		# compute new accumulated objectClass
+		old_ocs = module.oldattr.get('objectClass', )
+		ocs = set(old_ocs)
+
+		is_enabled = moduleNAME_PROPERTY == VALUE_ENABLED
+
+		for modification in ml::
+			attr, remove_val, add_val = modification
+
+			if attr == 'objectClass':
+				if not isinstance(remove_val, list):
+					remove_val = set(remove_val)
+				ocs -= set(remove_val)
+
+				if not isinstance(add_val, list):
+					add_val = set(add_val)
+					add_val.discard('')
+				ocs |= set(add_val)
+
+				ml.remove(modification)
+
+			elif not is_enabled and attr in REMOVE_ATTRIBUTES:
+				ml.remove(modification)
+			elif attr == NAME_ATTRIBUTE:
+				ml.remove(modification)
+
+		if is_enabled:
+			ocs.add(NAME_OBJECTCLASS)
+		else:
+			ocs.discard(NAME_OBJECTCLASS)
+			for attr in REMOVE_ATTRIBUTES:
+				ml.append((attr, module.oldattr.get(attr, ''), ''))
+
+		ml.append(('objectClass', old_ocs, list(ocs)))
+
+		ud.debug(ud.ADMIN, ud.ALL, 'admin.hook.hookKolabEnabled.modlist\n ml = %s' % pprint.PrettyPrinter(indent=4).pformat(ml))
+		return ml

kolab-3.1.9.tar.gz/ucs/kolab-ucs-join-script.sh -> kolab-16.0.0.tar.gz/ucs/kolab-ucs-join-script.sh Changed

@@ -1,9 +1,10 @@
 #!/bin/bash
 
-VERSION=2
+VERSION=6
 
-. /usr/share/univention-join/joinscripthelper.lib
+# We should probably just use base.sh and ldap.sh, for now we just use all.sh
 . /usr/share/univention-lib/all.sh
+. /usr/share/univention-join/joinscripthelper.lib
 joinscript_init
 
 function addUserAttribute {
@@ -11,7 +12,7 @@
 	shift
 	udm settings/extended_attribute create \
 		--ignore_exists \
-		--position "cn=custom attributes,cn=univention,$ldap_base" \
+		--position "cn=kolab,cn=custom attributes,cn=univention,$ldap_base" \
 		--set tabName="Mail" \
 		--append translationTabName='"de_CH" "Mail"' \
 		--append translationTabName='"de_DE" "Mail"' \
@@ -23,84 +24,216 @@
 
 eval "$(univention-config-registry shell)"
 
-if  "${server_role}" == "domaincontroller_master" -o \
-        "${server_role}" == "domaincontroller_backup" -o \
-        "${server_role}" == "domaincontroller_slave" -o \
-        "${server_role}" == "memberserver" ; then
-
-    # Delete old service references
-    echo -n "Removing legacy kolab2 service reference from LDAP ... "
-	univention-admin settings/service remove \
-        --dn cn=kolab2,cn=services,cn=univention,${ldap_base} \
-        >/dev/null 2>&1 && echo "OK" || echo "FAIL"
-
-    echo -n "Creating kolab service in LDAP ... "
-	univention-admin container/cn create \
-        --ignore_exists $@ \
-        --position cn=univention,${ldap_base} \
-        --set name=services >/dev/null 2>&1
-
-	univention-admin settings/service create \
-        --ignore_exists $@ \
-        --position cn=services,cn=univention,${ldap_base} \
-        --set name=kolab \
-        >/dev/null 2>&1 && echo "OK" || echo "FAIL"
-
-    echo -n "Appending service kolab ..."
-	univention-admin computers/${server_role} modify \
-        $@ --dn ${ldap_hostdn} \
-        --remove service="kolab2" \
-        >/dev/null 2>&1
-
-	univention-admin computers/${server_role} modify \
-        $@ --dn ${ldap_hostdn} \
-        --append service="kolab" \
-        >/dev/null 2>&1 && echo "OK" || echo "FAIL"
-
-	# if there is no default kolab home server ...
-	kolab_home=`univention-admin 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 ... "
-		univention-admin settings/default modify \
-            $@ --dn cn=default,cn=univention,${ldap_base} \
-            --set defaultUniventionMailHomeServer="${hostname}.${domainname}" \
-            >/dev/null 2>&1 && echo "OK" || echo "FAIL"
-	fi
-
-    echo -n "Creating Groupware Account template ... "
-	univention-admin 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>" \
-        >/dev/null 2>&1 && echo "OK" || echo "FAIL"
+# Delete old service references
+echo -n "Removing legacy Kolab 2 service reference from LDAP ... "
+ucs_removeServiceFromLocalhost "kolab2" "$@"
+
+# Delete old custom attributes (we use our own container now, see below)
+for ATTRIBUTE in \
+	KolabEnabled \
+	KolabForwardAddress \
+	KolabForwardActive \
+	KolabForwardKeepCopy \
+	KolabForwardUCE \
+	KolabVacationText \
+	KolabVacationActive \
+	KolabVacationAddress \
+	KolabVacationNoReactDomain \
+	KolabDeliveryToFolderName \
+	KolabDeliveryToFolderActive ; \
+do udm settings/extended_attribute remove \
+	--dn "cn=$ATTRIBUTE,cn=custom attributes,cn=univention,$ldap_base" ; done
+
+# Create a container for all Kolab-related custom attributes
+univention-directory-manager container/cn create "$@" --ignore_exists \
+	--position "cn=custom attributes,cn=univention,$ldap_base" \
+	--set name=kolab
+
+# Register Kolab service
+echo -n "Creating Kolab service in LDAP ... "
+ucs_addServiceToLocalhost "kolab" "$@"
+
+# Register LDAP schema extensions
+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_syntax /usr/share/kolab-ucs/kolab-syntax-classes.py
+
+# Create Groupware account template
+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 mailPrimaryAddress="<username>@${domainname}" \
+	--set e-mail="<username>@${domainname}" \
+	--set unixhome="/home/<username>"
+
+mail=$(udm settings/usertemplate list "$@" --filter="cn=$domainname Groupware Account" | grep ' e-mail:' | sed 's/^:*: //;s/^None$//')
+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 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)
+udm settings/usertemplate remove --dn "$hostname.$domainname Groupware Account,cn=templates,cn=univention,${ldap_base}" || true
+
+# Create mail domain
 echo -n "Creating mail domain ${domainname} ... "
-univention-admin mail/domain create \
+udm mail/domain create \
     $@ --ignore_exists \
     --set name=${domainname} \
     --position cn=domain,cn=mail,${ldap_base} \
     >/dev/null 2>&1 && echo "OK" || echo "FAIL"
 
-# The rest of this script only needs to be executed if we're on a system that has the UDM
-# installed.
+# Create cyrus-admin user
+echo -n "Creating Cyrus Admin user ... "
+udm users/user create "$@" --ignore_exists \
+	--set password=$(cat /etc/cyrus.secret) \
+	--set "username=cyrus-admin" \
+	--set "firstname=Cyrus" \
+	--set "lastname=Administrator" \
+	--position "cn=users,${ldap_base}"
 
-if  -z "$(which udm 2>/dev/null)" ; then
-    joinscript_save_current_version
-    exit 0
-fi
+### UMC Settings
+
+udm settings/extended_attribute create "$@" --ignore_exists \
+	--set objectClass=univentionObject \
+	--set name=KolabEnabled \
+	--set CLIName=KolabEnabled \
+	--append module=users/user \
+	--set tabName="Account" \
+	--set tabAdvanced=0 \
+	--set overwriteTab=0 \
+	--append translationTabName='"de_CH" "Konto"' \
+	--append translationTabName='"de_DE" "Konto"' \
+	--set groupName="Kolab Groupware" \
+	--set shortDescription="Kolab Groupware Account" \
+	--set longDescription="Defines if the user can use Kolab Groupware features" \
+	--append translationShortDescription='"de_DE" "Kolab Groupware Konto"' \
+	--append translationLongDescription='"de_DE" "Legt fest, ob der Nutzer Kolab Groupware Funktionen nutzen kann"' \
+	--set hook=hookKolabEnabled \
+	--set ldapMapping=kolabDummyAttribute \
+	--set deleteObjectClass=0 \
+	--set version=2 \
+	--set valueRequired=0 \
+	--set fullWidth=0 \
+	--set doNotSearch=0 \
+	--set syntax=boolean \
+	--set default=1 \
+	--set mayChange=1 \
+	--set multivalue=0 \
+	--set notEditable=0 \
+	--set disableUDMWeb=0 \
+	--position "cn=kolab,cn=custom attributes,cn=univention,${ldap_base}"
+
+# Shared folder type
+udm settings/extended_attribute create "$@" --ignore_exists \
+	--set objectClass=kolabSharedFolder \
+	--set name=KolabFolderType \
+	--set CLIName=KolabFolderType \
+	--append module=mail/folder \
+	--set tabName="General" \
+	--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 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."' \
+	--set ldapMapping=kolabFolderType \
+	--set deleteObjectClass=1 \
+	--set valueRequired=0 \
+	--set doNotSearch=0 \
+	--set syntax=mail_folder_type \
+	--set default=None \
+	--set mayChange=1 \
+	--set multivalue=0 \
+	--set notEditable=0 \
+	--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" \
+	--set name="KolabDelegate" \
+	--set CLIName="KolabDelegate" \
+	--append module="users/user" \
+	--append module="users/self" \
+	--set groupPosition=2 \
+	--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="Delegation" \
+	--append translationGroupName='"de_CH" "Vertretung"' \
+	--append translationGroupName='"de_DE" "Vertretung"' \
+	--set shortDescription="Delegates" \
+	--append translationShortDescription='"de_CH" "Vertreter"' \
+	--set longDescription="Delegates can answer mail and invitations on behalf of a user." \
+	--append translationLongDescription='"de_CH" "Vertreter können Mails und Einladungen im Namen des Nutzers beantworten."' \
+	--append translationLongDescription='"de_DE" "Vertreter können Mails und Einladungen im Namen des Nutzers beantworten."' \
+	--set ldapMapping=kolabDelegate \
+	--set deleteObjectClass=0 \
+	--set valueRequired=0 \
+	--set fullWidth=0 \
+	--set doNotSearch=0 \
+	--set syntax=UserDN \
+	--set mayChange=1 \
+	--set multivalue=1 \
+	--set notEditable=0 \
+	--set disableUDMWeb=0 \
+	--position "cn=kolab,cn=custom attributes,cn=univention,${ldap_base}"
 
-### Admin Settings
 # Forwards
 addUserAttribute KolabForwardAddress \
+	"$@" \
 	--set objectClass="kolabInetOrgPerson" \
 	--append module="users/user" \
 	--append module="users/self" \
@@ -117,6 +250,7 @@
 	--set ldapMapping=kolabForwardAddress
 
 addUserAttribute KolabForwardActive \
+	"$@" \
 	--set objectClass="univentionKolabInetOrgPerson" \
 	--append module="users/user" \
 	--append module="users/self" \
@@ -133,6 +267,7 @@
 	--set ldapMapping=univentionKolabForwardActive
 
 addUserAttribute KolabForwardKeepCopy \
+	"$@" \
 	--set objectClass="kolabInetOrgPerson" \
 	--append module="users/user" \
 	--append module="users/self" \
@@ -149,6 +284,7 @@
 	--set ldapMapping=kolabForwardKeepCopy
 
 addUserAttribute KolabForwardUCE \
+	"$@" \
 	--set objectClass="kolabInetOrgPerson" \
 	--append module="users/user" \
 	--append module="users/self" \
@@ -166,6 +302,7 @@
 
 # Vacation
 addUserAttribute KolabVacationText \
+	"$@" \
 	--set objectClass="univentionKolabInetOrgPerson" \
 	--append module="users/user" \
 	--append module="users/self" \
@@ -182,6 +319,7 @@
 	--set ldapMapping=univentionKolabVacationText
 
 addUserAttribute KolabVacationActive \
+	"$@" \
 	--set objectClass="univentionKolabInetOrgPerson" \
 	--append module="users/user" \
 	--append module="users/self" \
@@ -198,6 +336,7 @@
 	--set ldapMapping=univentionKolabVacationActive
 
 addUserAttribute KolabVacationAddress \
+	"$@" \
 	--set objectClass="kolabInetOrgPerson" \
 	--append module="users/user" \
 	--append module="users/self" \
@@ -214,6 +353,7 @@
 	--set ldapMapping=kolabVacationAddress
 
 addUserAttribute KolabVacationNoReactDomain \
+	"$@" \
 	--set objectClass="univentionKolabInetOrgPerson" \
 	--append module="users/user" \
 	--append module="users/self" \
@@ -229,16 +369,58 @@
 	--append translationShortDescription='"de_DE" "Domains von Abwesenheitsnotiz ausnehmen"' \
 	--set ldapMapping=univentionKolabVacationNoReactDomain
 
+# SMTP Access Policy
+addUserAttribute KolabAllowSMTPSender \
+	"$@" \
+	--set objectClass="kolabInetOrgPerson" \
+	--append module="users/user" \
+	--append module="users/self" \
+	--set groupPosition=21 \
+	--set groupName="SMTP Access Policy" \
+	--append translationGroupName='"de_CH" "SMTP-Zugriffsrichtlinien"' \
+	--append translationGroupName='"de_DE" "SMTP-Zugriffsrichtlinien"' \
+	--set tabPosition=1 \
+	--set shortDescription="Sender Access List" \
+	--append translationShortDescription='"de_CH" "Liste von Absendern"' \
+	--append translationShortDescription='"de_DE" "Liste von Absendern"' \
+	--set longDescription="Wildcards or regular expressions allowed. To reject an address or domain, prefix the entry with -, e.g. -john.doe@example.org. Most accurate policy is applied."\
+	--append translationLongDescription='"de_CH" "Platzhalter oder reguäre Ausdücke erlaubt. Um eine Adresse oder Domäne zu abzuweisen, den Eintrag mit - beginnen, z. B. -max.mustermann@example.org. Die zutreffendste Richtinige wird angewandt."'\
+	--append translationLongDescription='"de_DE" "Platzhalter oder reguäre Ausdücke erlaubt. Um eine Adresse oder Domäne zu abzuweisen, den Eintrag mit - beginnen, z. B. -max.mustermann@example.org. Die zutreffendste Richtinige wird angewandt."'\
+	--set syntax=string \
+	--set multivalue=1 \
+	--set ldapMapping=kolabAllowSMTPSender
+
+addUserAttribute KolabAllowSMTPRecipient \
+	"$@" \
+	--set objectClass="kolabInetOrgPerson" \
+	--append module="users/user" \
+	--append module="users/self" \
+	--set groupPosition=22 \
+	--set groupName="SMTP Access Policy" \
+	--append translationGroupName='"de_CH" "SMTP-Zugriffsrichtlinien"' \
+	--append translationGroupName='"de_DE" "SMTP-Zugriffsrichtlinien"' \
+	--set tabPosition=1 \
+	--set shortDescription="Recipient(s) Access List" \
+	--append translationShortDescription='"de_CH" "Liste von Adressaten"' \
+	--append translationShortDescription='"de_DE" "Liste von Adressaten"' \
+	--set longDescription="Wildcards or regular expressions allowed. To reject an address or domain, prefix the entry with -, e.g. -john.doe@example.org. Most accurate policy is applied."\
+	--append translationLongDescription='"de_CH" "Platzhalter oder reguäre Ausdücke erlaubt. Um eine Adresse oder Domäne zu abzuweisen, den Eintrag mit - beginnen, z. B. -max.mustermann@example.org. Die zutreffendste Richtinige wird angewandt."'\
+	--append translationLongDescription='"de_DE" "Platzhalter oder reguäre Ausdücke erlaubt. Um eine Adresse oder Domäne zu abzuweisen, den Eintrag mit - beginnen, z. B. -max.mustermann@example.org. Die zutreffendste Richtinige wird angewandt."'\
+	--set syntax=string \
+	--set multivalue=1 \
+	--set ldapMapping=kolabAllowSMTPRecipient
+
 # Delivery
 addUserAttribute KolabDeliveryToFolderName \
+	"$@" \
 	--set objectClass="univentionKolabInetOrgPerson" \
 	--append module="users/user" \
 	--append module="users/self" \
-	--set groupPosition=3 \
+	--set groupPosition=4 \
 	--set groupName="Delivery" \
 	--append translationGroupName='"de_CH" "Zustellung"' \
 	--append translationGroupName='"de_DE" "Zustellung"' \
-	--set tabPosition=21 \
+	--set tabPosition=31 \
 	--set syntax=string \
 	--set multivalue=0 \
 	--set shortDescription="Folder for incoming mail" \
@@ -247,14 +429,15 @@
 	--set ldapMapping=univentionKolabDeliveryToFolderName
 
 addUserAttribute KolabDeliveryToFolderActive \
+	"$@" \
 	--set objectClass="univentionKolabInetOrgPerson" \
 	--append module="users/user" \
 	--append module="users/self" \
-	--set groupPosition=3 \
+	--set groupPosition=4 \
 	--set groupName="Delivery" \
 	--append translationGroupName='"de_CH" "Zustellung"' \
 	--append translationGroupName='"de_DE" "Zustellung"' \
-	--set tabPosition=22 \
+	--set tabPosition=32 \
 	--set syntax=TrueFalseUp \
 	--set multivalue=0 \
 	--set shortDescription="Move incoming mails into chosen folder" \
@@ -267,8 +450,7 @@
     --dn "cn=Domain Users,cn=groups,$ldap_base" \
     --policy-reference "cn=default-udm-self,cn=UMC,cn=policies,$ldap_base"
 
-# Redirect output for sometimes other dependencies have not been installed successfully
-test -x /etc/init.d/slapd && invoke-rc.d slapd restart >/dev/null 2>&1
+stop_udm_cli_server
 
 joinscript_save_current_version

kolab-16.0.0.tar.gz/ucs/kolab-ucs-ldap.acl Added

kolab-16.0.0.tar.gz/ucs/kolab-ucs-logo.svg Added

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65"
+   height="65"
+   id="svg3030"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Neues Dokument 2">
+  <defs
+     id="defs3032" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-5.6037296"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="29"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3035">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,17)">
+    <path
+       style="fill:#face00"
+       inkscape:connector-curvature="0"
+       d="m 32.305123,-13.909028 c -16.795149,0 -29.9510204,13.1687791 -29.9510204,29.980407 0,13.925049 9.3716364,25.771455 22.8448734,28.958124 l 0.974062,0.220945 c 0.08895,0.01869 0.175704,0.03848 0.262458,0.06045 0.119699,0.02858 0.2383,0.05826 0.360194,0.07914 l 0.322857,0.02638 v -0.0022 l 0.296502,0.05276 c 0.477696,0.08574 0.900485,-0.225342 0.981748,-0.692515 l 0.05711,-0.325372 c 0.08236,-0.477066 -0.21414,-0.90027 -0.690738,-0.983811 L 26.774831,43.2927 26.624384,43.2861 C 13.521218,40.664459 4.3823909,29.492982 4.3823909,16.07028 c 0,-15.6717264 12.2652691,-27.94903 27.9227321,-27.94903 7.52674,0 14.570292,2.889877 19.833738,8.1387015 5.26784,5.2521225 8.170258,12.2882955 8.170258,19.8103285 0,13.461175 -9.229975,24.66343 -22.441852,27.244423 l -0.86205,0.150595 c -0.229514,0.03957 -0.424985,0.163785 -0.554567,0.346258 -0.127385,0.182472 -0.176803,0.410012 -0.136171,0.638653 l 0.05711,0.323173 c 0.07138,0.416608 0.410709,0.706805 0.826909,0.706805 0.05052,0 0.103226,-0.0044 0.155938,-0.01319 l 0.295403,-0.05276 v 0.0011 L 39.548546,44.99653 C 52.988835,41.758168 62.33741,29.924954 62.33741,16.071355 c 0,-8.067251 -3.112165,-15.6145668 -8.764357,-21.2503205 -5.645604,-5.6291595 -13.1987,-8.7300875 -21.267927,-8.7300875"
+       id="path36" />
+  </g>
+</svg>

kolab-16.0.0.tar.gz/ucs/kolab-ucs-syntax-classes.py Added

@@ -0,0 +1,31 @@
+class KolabInvitationPolicies(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'),
+

kolab-16.0.0.tar.gz/ucs/kolab-ucs-unjoin-script.sh Added

@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# Kolab Systems UCS Groupware Server
+#  unjoin script
+#
+# Copyright 2015 Kolab Systems AG
+#
+# http://www.kolabsystems.com/
+#
+# All rights reserved.
+#
+# The source code of this program is made available
+# under the terms of the GNU Affero General Public License version 3
+# (GNU AGPL V3) as published by the Free Software Foundation.
+#
+# Binary versions of this program provided by Univention to you as
+# well as other copyrighted, protected or trademarked materials like
+# Logos, graphics, fonts, specific documentations and configurations,
+# cryptographic keys etc. are subject to a license agreement between
+# you and Univention and not subject to the GNU AGPL V3.
+#
+# In the case you use this program under the terms of the GNU AGPL V3,
+# the program is provided in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License with the Debian GNU/Linux or Univention distribution in file
+# /usr/share/common-licenses/AGPL-3; if not, see
+# <http://www.gnu.org/licenses/>.
+
+VERSION=3
+
+. /usr/share/univention-join/joinscripthelper.lib
+. /usr/share/univention-lib/all.sh
+joinscript_init
+
+SERVICE="kolab"
+
+eval "$(ucr shell)"
+
+# remove extented attributes
+for ATTRIBUTE in \
+	KolabEnabled \
+	KolabFolderType \
+	KolabInvitationPolicy \
+	KolabDelegate \
+	KolabForwardAddress \
+	KolabForwardActive \
+	KolabForwardKeepCopy \
+	KolabForwardUCE \
+	KolabVacationText \
+	KolabVacationActive \
+	KolabVacationAddress \
+	KolabVacationNoReactDomain \
+	KolabAllowSMTPSender \
+	KolabAllowSMTPRecipient \
+	KolabDeliveryToFolderName \
+	KolabDeliveryToFolderActive ; \
+do udm settings/extended_attribute remove \
+	--dn "cn=$ATTRIBUTE,cn=kolab,cn=custom attributes,cn=univention,$ldap_base" ; done
+
+# Remove our container
+udm container/cn delete --dn "cn=kolab2,cn=custom attributes,cn=univention,$ldap_base"
+
+# Remove user template
+udm settings/usertemplate remove \
+	--dn "cn=$domainname Groupware Account,cn=templates,cn=univention,${ldap_base}"
+
+# remove service from my host object
+ucs_removeServiceFromLocalhost "kolab" "$@" || die
+
+# do NOT call "joinscript_save_current_version"
+# otherwise an entry will be appended to /var/univenion-join/status
+# instead the join script needs to be removed from the status file
+joinscript_remove_script_from_status_file kolab-ucs
+
+exit 0

kolab-3.1.9.tar.gz/ucs/kolab-webclient-join-script.sh -> kolab-16.0.0.tar.gz/ucs/kolab-webclient-join-script.sh Changed

@@ -2,9 +2,9 @@
 #
 # Kolab Webclient join script
 #
-# Copyright (C) 2012 Kolab Systems AG <contact@kolabsys.com>
+# Copyright (C) 2012 Kolab Systems AG <contact@kolabsystems.com>
 #
-# http://kolabsys.com/
+# http://kolabsystems.com/
 #
 # All rights reserved.
 #
@@ -35,19 +35,6 @@
     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
@@ -149,8 +136,17 @@
     invoke-rc.d apache2 reload
 fi
 
+# Register the webclient on UCS landing page
+ucr set \
+    ucs/web/overview/entries/service/kolab-webclient/icon?"/webmail/skins/enterprise/images/kolab-ucs-logo.svg" \
+    ucs/web/overview/entries/service/kolab-webclient/link?"/webmail" \
+    ucs/web/overview/entries/service/kolab-webclient/label?"Kolab Enterprise Web Application" \
+    ucs/web/overview/entries/service/kolab-webclient/label/de?"Kolab Enterprise Webanwendung" \
+    ucs/web/overview/entries/service/kolab-webclient/description?"Manage mail, contacts, appointments, tasks, and notes" \
+    ucs/web/overview/entries/service/kolab-webclient/description/de?"Nachrichten, Kontakte, Termine, Aufgaben und Notizen verwalten"
+
 # add service to my host object
-ucs_addServiceToLocalhost Kolab-Webclient"" "$@"
+ucs_addServiceToLocalhost "Kolab-Webclient" "$@"
 
 joinscript_save_current_version

kolab-3.1.9.tar.gz/ucs/kolab-webclient-passwd-change.sh -> kolab-16.0.0.tar.gz/ucs/kolab-webclient-passwd-change.sh Changed

kolab-16.0.0.tar.gz/ucs/kolab-webclient-unjoin-script.sh Added

@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Kolab Webclient unjoin script
+#
+# Copyright (C) 2015 Kolab Systems AG <contact@kolabsystems.com>
+#
+# http://kolabsystems.com/
+#
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+VERSION=1
+
+. /usr/share/univention-lib/all.sh
+. /usr/share/univention-join/joinscripthelper.lib
+
+joinscript_init
+
+eval "$(univention-config-registry shell)"
+
+apache_reload=0
+
+# De-register the webclient on UCS landing page
+ucr unset \
+    ucs/web/overview/entries/service/kolab-webclient/icon \
+    ucs/web/overview/entries/service/kolab-webclient/link \
+    ucs/web/overview/entries/service/kolab-webclient/label \
+    ucs/web/overview/entries/service/kolab-webclient/label/de \
+    ucs/web/overview/entries/service/kolab-webclient/description \
+    ucs/web/overview/entries/service/kolab-webclient/description/de
+
+# remove service from my host object
+ucs_removeServiceFromLocalhost "Kolab-Webclient" "$@"
+
+joinscript_remove_script_from_status_file kolab-webclient
+
+exit 0
+

kolab-3.1.9.tar.gz/ucs/conffiles/etc/ldap Deleted

kolab-3.1.9.tar.gz/ucs/conffiles/etc/ldap/slapd.conf.d Deleted

kolab-3.1.9.tar.gz/ucs/conffiles/etc/ldap/slapd.conf.d/20kolab3_schema Deleted

kolab-3.1.9.tar.gz/ucs/conffiles/etc/ldap/slapd.conf.d/66kolab3_self_write_attrs_acl Deleted

@@ -1,42 +0,0 @@
-@!@
-ldap_base=configRegistry.get('ldap/base')
-if configRegistry.get('ldap/server/type') == "master":
-        access="write"
-else:
-        access="read"
-
-ldap_base = configRegistry.get('ldap/base')
-
-attrs = 
-
-import os
-if os.path.exists('/etc/ldap/schema/kolab3.schema'):
-    attrs.extend(
-            
-                    'kolabDelegate',
-                    'kolabForwardAddress',
-                    'kolabForwardKeepCopy',
-                    'kolabForwardUCE',
-                    'kolabVacationAddress',
-                    'kolabVacationReactDomain',
-                    'kolabVacationReplyToUCE',
-                    'kolabVacationResendInterval',
-                
-        )
-
-if os.path.exists('/etc/ldap/schema/univention-kolab3-wrapper.schema'):
-    attrs.extend(
-            
-                    'univentionKolabForwardActive',
-                    'univentionKolabVacationText',
-                    'univentionKolabVacationNoReactDomain',
-                    'univentionKolabDeliveryToFolderName',
-                    'univentionKolabDeliveryToFolderActive',
-                
-        )
-
-print 'access to dn.sub="%(ldap_base)s" attrs="%(attrs)s"' % {'ldap_base': ldap_base, 'attrs': ','.join(attrs) }
-print '    by self write'
-print '    by * none break'
-
-@!@

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/compose_addressbook.inc.php Deleted

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/importmessages.inc.php Deleted

kolab-3.1.9.tar.gz/ucs/conffiles/etc/roundcubemail/mimetypes.php Deleted

@@ -1,53 +0,0 @@
-<?php
-
-/*
-@%@UCRWARNING= @%@
-*/
-
-return array(
-  'xls' => 'application/vnd.ms-excel',
-  'xlm' => 'application/vnd.ms-excel',
-  'xla' => 'application/vnd.ms-excel',
-  'xlc' => 'application/vnd.ms-excel',
-  'xlt' => 'application/vnd.ms-excel',
-  'xlw' => 'application/vnd.ms-excel',
-  'pdf' => 'application/pdf',
-  'ppt' => 'application/vnd.ms-powerpoint',
-  'pps' => 'application/vnd.ms-powerpoint',
-  'pot' => 'application/vnd.ms-powerpoint',
-  'doc' => 'application/msword',
-  'dot' => 'application/msword',
-  'odc' => 'application/vnd.oasis.opendocument.chart',
-  'otc' => 'application/vnd.oasis.opendocument.chart-template',
-  'odf' => 'application/vnd.oasis.opendocument.formula',
-  'otf' => 'application/vnd.oasis.opendocument.formula-template',
-  'odg' => 'application/vnd.oasis.opendocument.graphics',
-  'otg' => 'application/vnd.oasis.opendocument.graphics-template',
-  'odi' => 'application/vnd.oasis.opendocument.image',
-  'oti' => 'application/vnd.oasis.opendocument.image-template',
-  'odp' => 'application/vnd.oasis.opendocument.presentation',
-  'otp' => 'application/vnd.oasis.opendocument.presentation-template',
-  'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-  'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
-  'odt' => 'application/vnd.oasis.opendocument.text',
-  'otm' => 'application/vnd.oasis.opendocument.text-master',
-  'ott' => 'application/vnd.oasis.opendocument.text-template',
-  'oth' => 'application/vnd.oasis.opendocument.text-web',
-  'docm' => 'application/vnd.ms-word.document.macroEnabled.12',
-  'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-  'dotm' => 'application/vnd.ms-word.template.macroEnabled.12',
-  'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-  'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
-  'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-  'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
-  'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-  'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-  'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
-  'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-  'xps' => 'application/vnd.ms-xpsdocument',
-  'rar' => 'application/x-rar-compressed',
-  'vcf' => 'text/vcard',
-  'ics' => 'text/calendar',
-);
-
-?>

kolab-3.1.9.tar.gz/ucs/conffiles/var Deleted

kolab-3.1.9.tar.gz/ucs/conffiles/var/www Deleted

kolab-3.1.9.tar.gz/ucs/conffiles/var/www/ucs-overview Deleted

kolab-3.1.9.tar.gz/ucs/conffiles/var/www/ucs-overview/de.html.d Deleted

kolab-3.1.9.tar.gz/ucs/conffiles/var/www/ucs-overview/de.html.d/50kolab-webclient-de.html Deleted

kolab-3.1.9.tar.gz/ucs/conffiles/var/www/ucs-overview/en.html.d Deleted

kolab-3.1.9.tar.gz/ucs/conffiles/var/www/ucs-overview/en.html.d/50kolab-webclient-en.html Deleted

kolab-3.1.9.tar.gz/ucs/kolab-ucs-passwd-change.sh Deleted

@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# Kolab Systems Kolab 2 Framwork
-#   machine password hook script
-#
-# Copyright 2011-2012 Kolab Systems AG
-#
-# http://www.kolabsys.com/
-#
-# All rights reserved.
-#
-# The source code of this program is made available
-# under the terms of the GNU Affero General Public License version 3
-# (GNU AGPL V3) as published by the Free Software Foundation.
-#
-# Binary versions of this program provided by Univention to you as
-# well as other copyrighted, protected or trademarked materials like
-# Logos, graphics, fonts, specific documentations and configurations,
-# cryptographic keys etc. are subject to a license agreement between
-# you and Univention and not subject to the GNU AGPL V3.
-#
-# In the case you use this program under the terms of the GNU AGPL V3,
-# the program is provided in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License with the Debian GNU/Linux or Univention distribution in file
-# /usr/share/common-licenses/AGPL-3; if not, see
-# <http://www.gnu.org/licenses/>.
-
-#if  "$1" = "postchange"  ; then
-#	ucr commit \
-#		/etc/kolab2/freebusy.conf \
-#		/etc/kolab2/resmgr.conf \
-#		/etc/horde/horde3/conf.d/20-kolab_ucs.php || :
-#fi

kolab-3.1.9.tar.gz/ucs/kolab_ucs_logo.png Deleted

kolab.dsc Changed

Changes of Revision 2