5 commits - ucs/conffiles ucs/debian ucs/kolab-ucs-join-script.sh

Christoph Wickert wickert at kolabsys.com
Wed Feb 4 18:38:49 CET 2015


 ucs/conffiles/etc/aliases                                   |    4 
 ucs/conffiles/etc/cyrus.conf.d/10_START_spool               |   24 +---
 ucs/conffiles/etc/cyrus.conf.d/20_SERVICES_spool            |   60 ++++++------
 ucs/conffiles/etc/cyrus.conf.d/30_EVENT_spool               |   12 +-
 ucs/conffiles/etc/default/kolab-saslauthd                   |    2 
 ucs/conffiles/etc/imapd.conf                                |   22 +---
 ucs/conffiles/etc/kolab-freebusy/config.ini                 |    2 
 ucs/conffiles/etc/postfix/header_checks.inbound             |    2 
 ucs/conffiles/etc/postfix/header_checks.internal            |    2 
 ucs/conffiles/etc/postfix/header_checks.submission          |    2 
 ucs/conffiles/etc/postfix/main.cf.d/60_tls                  |    8 -
 ucs/conffiles/etc/postfix/master.cf.d/10_services           |    2 
 ucs/conffiles/etc/postfix/master.cf.d/60_kolab              |    2 
 ucs/conffiles/etc/postfix/sasl/smtpd.conf                   |    2 
 ucs/conffiles/etc/roundcubemail/acl.inc.php                 |    4 
 ucs/conffiles/etc/roundcubemail/calendar.inc.php            |    4 
 ucs/conffiles/etc/roundcubemail/config.inc.php              |    6 -
 ucs/conffiles/etc/roundcubemail/jqueryui.inc.php            |    4 
 ucs/conffiles/etc/roundcubemail/kolab_addressbook.inc.php   |    4 
 ucs/conffiles/etc/roundcubemail/kolab_auth.inc.php          |    4 
 ucs/conffiles/etc/roundcubemail/kolab_delegation.inc.php    |    3 
 ucs/conffiles/etc/roundcubemail/kolab_files.inc.php         |    4 
 ucs/conffiles/etc/roundcubemail/kolab_folders.inc.php       |   14 +-
 ucs/conffiles/etc/roundcubemail/ldap_authentication.inc.php |    4 
 ucs/conffiles/etc/roundcubemail/libkolab.inc.php            |    4 
 ucs/conffiles/etc/roundcubemail/managesieve.inc.php         |    4 
 ucs/debian/kolab-imap.postinst                              |    6 -
 ucs/debian/kolab-imap.preinst                               |    4 
 ucs/debian/kolab-imap.prerm                                 |    3 
 ucs/debian/kolab-imap.univention-config-registry            |    6 -
 ucs/debian/kolab-mta.preinst                                |    4 
 ucs/debian/kolab-mta.univention-config-registry             |    9 +
 ucs/debian/kolab-ucs.postinst                               |   26 ++---
 ucs/debian/kolab-ucs.preinst                                |    4 
 ucs/debian/kolab-webclient.univention-config-registry       |   54 ++++------
 ucs/kolab-ucs-join-script.sh                                |   18 +--
 36 files changed, 159 insertions(+), 180 deletions(-)

New commits:
commit b93334c100748f1b92216510fbca53f816dc583e
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Feb 4 18:38:43 2015 +0100

    Fix (most of) the remaining kolab-ucs ucslint errors (#4481)

diff --git a/ucs/conffiles/etc/default/kolab-saslauthd b/ucs/conffiles/etc/default/kolab-saslauthd
index 82296c5..70ca394 100644
--- a/ucs/conffiles/etc/default/kolab-saslauthd
+++ b/ucs/conffiles/etc/default/kolab-saslauthd
@@ -2,6 +2,8 @@
 # Settings for kolab-saslauthd daemon
 #
 
+@%@UCRWARNING=# @%@
+
 # Should kolab-saslauthd run automatically on startup? (default: no)
 START=yes
 
diff --git a/ucs/conffiles/etc/kolab-freebusy/config.ini b/ucs/conffiles/etc/kolab-freebusy/config.ini
index d11182d..2ea20fc 100644
--- a/ucs/conffiles/etc/kolab-freebusy/config.ini
+++ b/ucs/conffiles/etc/kolab-freebusy/config.ini
@@ -1,5 +1,7 @@
 ;; Kolab Free/Busy Service configuration
 
+@%@UCRWARNING=;; @%@
+
 ;; Require HTTP authentication to access this service
 [httpauth]
 
diff --git a/ucs/debian/kolab-ucs.postinst b/ucs/debian/kolab-ucs.postinst
index 8186321..c429299 100755
--- a/ucs/debian/kolab-ucs.postinst
+++ b/ucs/debian/kolab-ucs.postinst
@@ -33,31 +33,27 @@
 
 #DEBHELPER#
 
-if [ ! -d /usr/share/univention-admin/www ]; then
-	mkdir -p /usr/share/univention-admin/www
-fi
-
-eval "$(univention-config-registry shell)"
+eval "$(ucr shell)"
 
-univention-config-registry set mail/antivir/spam?yes
+ucr 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
+	ucr set mail/cyrus/caluser?kolab2cal@$domainname
+	ucr 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
+	ucr set mail/cyrus/caluser?kolab2cal@$domainname
+	ucr 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\/$//'`
+	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
-		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>"
+		udm settings/usertemplate modify --dn "cn=$domainname Groupware Account,cn=templates,cn=univention,$ldap_base" --set univentionMailHomeServer="$hostname.$domainname" --set mailPrimaryAddress="<username>@$domainname" --set e-mail="<username>@$domainname" --set shell="/bin/bash" --set unixhome="/home/<username>"
 	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
+	udm settings/usertemplate remove --dn "$hostname.$domainname Groupware Account,cn=templates,cn=univention,${ldap_base}" > /dev/null || true
 fi
 
 if [ ! -e "/etc/cyrus.secret" ]; then
diff --git a/ucs/debian/kolab-ucs.preinst b/ucs/debian/kolab-ucs.preinst
index 929128d..0e410a7 100755
--- a/ucs/debian/kolab-ucs.preinst
+++ b/ucs/debian/kolab-ucs.preinst
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-eval $(ucr shell)
+#DEBHELPER#
+
+eval "$(ucr shell)"
 
 if [ ! -e "/etc/cyrus.secret" ]; then
     touch /etc/cyrus.secret


commit dbe3c7402ca88fc53eaf87b2d81ee0dcbce73bdb
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Feb 4 18:37:30 2015 +0100

    Fix ucslint errors in kolab-webclient (#4481)

diff --git a/ucs/conffiles/etc/roundcubemail/acl.inc.php b/ucs/conffiles/etc/roundcubemail/acl.inc.php
index 06005aa..5b7ab92 100644
--- a/ucs/conffiles/etc/roundcubemail/acl.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/acl.inc.php
@@ -1,8 +1,6 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
 // Default look of access rights table
 // In advanced mode all access rights are displayed separately
diff --git a/ucs/conffiles/etc/roundcubemail/calendar.inc.php b/ucs/conffiles/etc/roundcubemail/calendar.inc.php
index e43e153..304427d 100644
--- a/ucs/conffiles/etc/roundcubemail/calendar.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/calendar.inc.php
@@ -1,8 +1,6 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
 /*
  +-------------------------------------------------------------------------+
diff --git a/ucs/conffiles/etc/roundcubemail/config.inc.php b/ucs/conffiles/etc/roundcubemail/config.inc.php
index 85774a7..973475e 100644
--- a/ucs/conffiles/etc/roundcubemail/config.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/config.inc.php
@@ -1,8 +1,6 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
     $config = array();
 
@@ -146,7 +144,7 @@ else:
     $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;"
diff --git a/ucs/conffiles/etc/roundcubemail/jqueryui.inc.php b/ucs/conffiles/etc/roundcubemail/jqueryui.inc.php
index 1d1c125..07a3d9e 100644
--- a/ucs/conffiles/etc/roundcubemail/jqueryui.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/jqueryui.inc.php
@@ -1,8 +1,6 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
 // if you want to load localization strings for specific sub-libraries of jquery-ui, configure them here 
 $config['jquery_ui_i18n'] = array('datepicker');
diff --git a/ucs/conffiles/etc/roundcubemail/kolab_addressbook.inc.php b/ucs/conffiles/etc/roundcubemail/kolab_addressbook.inc.php
index bfb191d..6e52703 100644
--- a/ucs/conffiles/etc/roundcubemail/kolab_addressbook.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/kolab_addressbook.inc.php
@@ -1,8 +1,6 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
 /*
  This option allows to set addressbooks priority or to disable some
diff --git a/ucs/conffiles/etc/roundcubemail/kolab_auth.inc.php b/ucs/conffiles/etc/roundcubemail/kolab_auth.inc.php
index 46af155..f3d4ac5 100644
--- a/ucs/conffiles/etc/roundcubemail/kolab_auth.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/kolab_auth.inc.php
@@ -1,8 +1,6 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
     // The id of the LDAP address book (which refers to the rcmail_config['ldap_public'])
     // or complete addressbook definition array.
diff --git a/ucs/conffiles/etc/roundcubemail/kolab_delegation.inc.php b/ucs/conffiles/etc/roundcubemail/kolab_delegation.inc.php
index 0e172e5..c689098 100644
--- a/ucs/conffiles/etc/roundcubemail/kolab_delegation.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/kolab_delegation.inc.php
@@ -1,4 +1,7 @@
 <?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))';
diff --git a/ucs/conffiles/etc/roundcubemail/kolab_files.inc.php b/ucs/conffiles/etc/roundcubemail/kolab_files.inc.php
index e37079f..b25268b 100644
--- a/ucs/conffiles/etc/roundcubemail/kolab_files.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/kolab_files.inc.php
@@ -1,8 +1,10 @@
 <?php
 
+@%@UCRWARNING=// @%@
+
 // URL of kolab-chwala installation
 @!@
-if baseConfig.get('mail/kolab/https', 0) > 0:
+if configRegistry.get('mail/kolab/https', 0) > 0:
     print "$config['kolab_files_url'] = 'http://'.$_SERVER['HTTP_HOST'].'/chwala';"
 else:
     print "$config['kolab_files_url'] = 'https://'.$_SERVER['HTTP_HOST'].'/chwala';"
diff --git a/ucs/conffiles/etc/roundcubemail/kolab_folders.inc.php b/ucs/conffiles/etc/roundcubemail/kolab_folders.inc.php
index 6599d03..5206e02 100644
--- a/ucs/conffiles/etc/roundcubemail/kolab_folders.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/kolab_folders.inc.php
@@ -1,14 +1,12 @@
 <?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.
 
     $config['kolab_folders_configuration_default'] = 'Configuration';
     $config['kolab_folders_event_default'] = 'Calendar';
diff --git a/ucs/conffiles/etc/roundcubemail/ldap_authentication.inc.php b/ucs/conffiles/etc/roundcubemail/ldap_authentication.inc.php
index 5c6fe61..1541ef3 100644
--- a/ucs/conffiles/etc/roundcubemail/ldap_authentication.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/ldap_authentication.inc.php
@@ -1,8 +1,6 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
 // The id of the LDAP address book (which refers to the $config['ldap_public'])
 // or complete addressbook definition array.
diff --git a/ucs/conffiles/etc/roundcubemail/libkolab.inc.php b/ucs/conffiles/etc/roundcubemail/libkolab.inc.php
index da7e8c7..6a7d236 100644
--- a/ucs/conffiles/etc/roundcubemail/libkolab.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/libkolab.inc.php
@@ -1,8 +1,6 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
     /* Configuration for libkolab */
 
diff --git a/ucs/conffiles/etc/roundcubemail/managesieve.inc.php b/ucs/conffiles/etc/roundcubemail/managesieve.inc.php
index 5920d08..99f1443 100644
--- a/ucs/conffiles/etc/roundcubemail/managesieve.inc.php
+++ b/ucs/conffiles/etc/roundcubemail/managesieve.inc.php
@@ -1,8 +1,6 @@
 <?php
 
-/*
-@%@UCRWARNING= @%@
-*/
+@%@UCRWARNING=// @%@
 
 // managesieve server port. When empty the port will be determined automatically
 // using getservbyname() function, with 4190 as a fallback.
diff --git a/ucs/debian/kolab-webclient.univention-config-registry b/ucs/debian/kolab-webclient.univention-config-registry
index fd4471d..407535e 100644
--- a/ucs/debian/kolab-webclient.univention-config-registry
+++ b/ucs/debian/kolab-webclient.univention-config-registry
@@ -9,6 +9,18 @@ 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/config.inc.php
 Variables: domainname
 Variables: hostname
@@ -29,36 +41,6 @@ Group: www-data
 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 @@ Group: www-data
 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 @@ Group: www-data
 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,6 +88,13 @@ Group: www-data
 Mode: 0640
 
 Type: file
+File: etc/roundcubemail/libkolab.inc.php
+Variables: mail/kolab/format-mime-version
+User: root
+Group: www-data
+Mode: 0640
+
+Type: file
 File: etc/roundcubemail/managesieve.inc.php
 User: root
 Group: www-data
diff --git a/ucs/kolab-ucs-join-script.sh b/ucs/kolab-ucs-join-script.sh
index 7f0bc68..fedd061 100755
--- a/ucs/kolab-ucs-join-script.sh
+++ b/ucs/kolab-ucs-join-script.sh
@@ -30,49 +30,49 @@ if [ "${server_role}" == "domaincontroller_master" -o \
 
     # Delete old service references
     echo -n "Removing legacy kolab2 service reference from LDAP ... "
-	univention-admin settings/service remove \
+	udm 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 \
+	udm container/cn create \
         --ignore_exists $@ \
         --position cn=univention,${ldap_base} \
         --set name=services >/dev/null 2>&1
 
-	univention-admin settings/service create \
+	udm 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 \
+	udm computers/${server_role} modify \
         $@ --dn ${ldap_hostdn} \
         --remove service="kolab2" \
         >/dev/null 2>&1
 
-	univention-admin computers/${server_role} modify \
+	udm 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 \
+	kolab_home=`udm 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 \
+		udm 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 \
+	udm settings/usertemplate create \
         $@ --ignore_exists \
         --position cn=templates,cn=univention,${ldap_base} \
         --set name="${domainname} Groupware Account" \
@@ -84,7 +84,7 @@ if [ "${server_role}" == "domaincontroller_master" -o \
 fi
 
 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} \


commit 3f38f58547f01963bf73d0c96b9a62ebd86a00ef
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Feb 4 18:35:59 2015 +0100

    Fix ucslint errors in kolab-mta (#4481)

diff --git a/ucs/conffiles/etc/aliases b/ucs/conffiles/etc/aliases
index 2df0436..b7e43dc 100644
--- a/ucs/conffiles/etc/aliases
+++ b/ucs/conffiles/etc/aliases
@@ -3,8 +3,8 @@
 @!@
 import re
 _re=re.compile('mail/alias/*')
-keylist=baseConfig.keys()
+keylist=configRegistry.keys()
 for key in keylist:
 	if _re.match(key):
-		print '%s: %s' % (key.split('/')[-1],baseConfig[key])
+		print '%s: %s' % (key.split('/')[-1],configRegistry[key])
 @!@	
diff --git a/ucs/conffiles/etc/postfix/header_checks.inbound b/ucs/conffiles/etc/postfix/header_checks.inbound
index a05a3f8..d70edd6 100644
--- a/ucs/conffiles/etc/postfix/header_checks.inbound
+++ b/ucs/conffiles/etc/postfix/header_checks.inbound
@@ -1,3 +1,5 @@
+@%@UCRWARNING=# @%@
+
 /^X-Spam-Flag:.*YES/    REJECT
 /^X-Virus-Scanned:/     IGNORE
 /^X-Spam-(Flag):(.*NO)/                 REPLACE X-Orig-Spam-$(1):$(2)   
diff --git a/ucs/conffiles/etc/postfix/header_checks.internal b/ucs/conffiles/etc/postfix/header_checks.internal
index 19b507a..aedc699 100644
--- a/ucs/conffiles/etc/postfix/header_checks.internal
+++ b/ucs/conffiles/etc/postfix/header_checks.internal
@@ -1,2 +1,4 @@
+@%@UCRWARNING=# @%@
+
 /^Received:.*127\.0\.0\.1/  IGNORE
 /^X-PHP-Originating-Script:.*/  IGNORE
diff --git a/ucs/conffiles/etc/postfix/header_checks.submission b/ucs/conffiles/etc/postfix/header_checks.submission
index 4866ef8..a6a693f 100644
--- a/ucs/conffiles/etc/postfix/header_checks.submission
+++ b/ucs/conffiles/etc/postfix/header_checks.submission
@@ -1,3 +1,5 @@
+@%@UCRWARNING=# @%@
+
 /^Received:.*with ESMTPSA/  IGNORE
 /^Received:.*127\.0\.0\.1/  IGNORE
 /^User-Agent:/              IGNORE
diff --git a/ucs/conffiles/etc/postfix/main.cf.d/60_tls b/ucs/conffiles/etc/postfix/main.cf.d/60_tls
index dd1b543..fa3254a 100644
--- a/ucs/conffiles/etc/postfix/main.cf.d/60_tls
+++ b/ucs/conffiles/etc/postfix/main.cf.d/60_tls
@@ -4,9 +4,9 @@ smtpd_tls_auth_only = yes
 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 @@ smtpd_sasl_security_options = noanonymous
 
 # 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
diff --git a/ucs/conffiles/etc/postfix/master.cf.d/10_services b/ucs/conffiles/etc/postfix/master.cf.d/10_services
index cb6eb7b..abe6b6d 100644
--- a/ucs/conffiles/etc/postfix/master.cf.d/10_services
+++ b/ucs/conffiles/etc/postfix/master.cf.d/10_services
@@ -17,7 +17,7 @@ submission          inet        n       -       n       -       -       smtpd
     -o smtpd_sasl_authenticated_header=yes
     -o smtpd_client_restrictions=permit_sasl_authenticated,reject
 @!@
-if baseConfig.is_true('mail/kolab/smtp_access_policy', True):
+if configRegistry.is_true('mail/kolab/smtp_access_policy', True):
     print "    -o smtpd_data_restrictions=$submission_data_restrictions"
     print "    -o smtpd_recipient_restrictions=$submission_recipient_restrictions"
     print "    -o smtpd_sender_restrictions=$submission_sender_restrictions"
diff --git a/ucs/conffiles/etc/postfix/master.cf.d/60_kolab b/ucs/conffiles/etc/postfix/master.cf.d/60_kolab
index 2869cf0..9ec7604 100644
--- a/ucs/conffiles/etc/postfix/master.cf.d/60_kolab
+++ b/ucs/conffiles/etc/postfix/master.cf.d/60_kolab
@@ -1,5 +1,5 @@
 @!@
-if baseConfig.is_true('mail/kolab/smtp_access_policy', True):
+if configRegistry.is_true('mail/kolab/smtp_access_policy', True):
     print """
 recipient_policy    unix        -       n       n       -       -       spawn
     user=listener argv=/usr/lib/postfix/kolab_smtp_access_policy --verify-recipient
diff --git a/ucs/conffiles/etc/postfix/sasl/smtpd.conf b/ucs/conffiles/etc/postfix/sasl/smtpd.conf
index 196980d..e8c7d80 100644
--- a/ucs/conffiles/etc/postfix/sasl/smtpd.conf
+++ b/ucs/conffiles/etc/postfix/sasl/smtpd.conf
@@ -1,4 +1,4 @@
-@%@BCWARNING=#@%@
+@%@UCRWARNING=# @%@
 
 saslauthd_path: /var/run/saslauthd/mux
 pwcheck_method: saslauthd
diff --git a/ucs/debian/kolab-mta.preinst b/ucs/debian/kolab-mta.preinst
index de6039c..de1ce2a 100755
--- a/ucs/debian/kolab-mta.preinst
+++ b/ucs/debian/kolab-mta.preinst
@@ -1,12 +1,14 @@
 #!/bin/sh
 
+#DEBHELPER#
+
 createLogfile () {
 	touch $1
 	chown $2 $1
 	chmod $3 $1
 }
 
-eval $(ucr shell)
+eval "$(ucr shell)"
 
 if [ ! -e "/etc/cyrus.secret" ]; then
     touch /etc/cyrus.secret
diff --git a/ucs/debian/kolab-mta.univention-config-registry b/ucs/debian/kolab-mta.univention-config-registry
index 096e541..c26a8f6 100644
--- a/ucs/debian/kolab-mta.univention-config-registry
+++ b/ucs/debian/kolab-mta.univention-config-registry
@@ -59,18 +59,20 @@ Variables: mail/postfix/local/header/rewrite/clients
 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 +91,7 @@ Variables: mail/postfix/policy/listfilter/maxproc
 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 +105,7 @@ Variables: domainname
 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 +113,10 @@ Multifile: etc/postfix/transport
 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


commit 7f942b37a625a0e7e0d663a56371ce890dfefb8b
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Feb 4 18:33:53 2015 +0100

    Fix another ucslint error in kolab-imap (#4481)

diff --git a/ucs/conffiles/etc/imapd.conf b/ucs/conffiles/etc/imapd.conf
index 91ae705..454040d 100644
--- a/ucs/conffiles/etc/imapd.conf
+++ b/ucs/conffiles/etc/imapd.conf
@@ -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_pwcheck_method: auxprop saslauthd
 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


commit b70c3341191585f5fced4b73fc333b3bd84fa7c5
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Feb 4 18:29:07 2015 +0100

    Fix ucslint errors in kolab-imap (#4481)

diff --git a/ucs/conffiles/etc/cyrus.conf.d/10_START_spool b/ucs/conffiles/etc/cyrus.conf.d/10_START_spool
index 0760a9b..f4aa5cf 100644
--- a/ucs/conffiles/etc/cyrus.conf.d/10_START_spool
+++ b/ucs/conffiles/etc/cyrus.conf.d/10_START_spool
@@ -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 ---
 
diff --git a/ucs/conffiles/etc/cyrus.conf.d/20_SERVICES_spool b/ucs/conffiles/etc/cyrus.conf.d/20_SERVICES_spool
index e57b01a..2aab7b2 100644
--- a/ucs/conffiles/etc/cyrus.conf.d/20_SERVICES_spool
+++ b/ucs/conffiles/etc/cyrus.conf.d/20_SERVICES_spool
@@ -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 baseConfig[ucrVariable] != '':
-			bindprefix = "%s:" % baseConfig[ucrVariable]
+		if configRegistry.has_key(ucrVariable) and configRegistry[ucrVariable] != '':
+			bindprefix = "%s:" % configRegistry[ucrVariable]
 
-	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 @@ if not (baseConfig.has_key('mail/cyrus/murder/master') and baseConfig['mail/cyru
 	# 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":
+	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
 
diff --git a/ucs/conffiles/etc/cyrus.conf.d/30_EVENT_spool b/ucs/conffiles/etc/cyrus.conf.d/30_EVENT_spool
index 4c14852..a677f4c 100644
--- a/ucs/conffiles/etc/cyrus.conf.d/30_EVENT_spool
+++ b/ucs/conffiles/etc/cyrus.conf.d/30_EVENT_spool
@@ -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
diff --git a/ucs/debian/kolab-imap.postinst b/ucs/debian/kolab-imap.postinst
index 05ae62e..ed04691 100755
--- a/ucs/debian/kolab-imap.postinst
+++ b/ucs/debian/kolab-imap.postinst
@@ -1,10 +1,12 @@
 #!/bin/sh
 
+#DEBHELPER#
+
 case $1 in
     configure)
         . /usr/share/univention-lib/all.sh
 
-        eval `univention-config-registry shell hostname domainname server/role`
+        eval "ucr shell hostname domainname server/role"
 
         # Delete the kolab2cal user if we are upgrading from before 3.0
         if [ "$1" = configure -a -n "$2" ] && dpkg --compare-versions "$2" lt 3.0-1; then
@@ -24,7 +26,7 @@ case $1 in
         fi
 
         # remove unused cyrus version variable (#1417)
-        univention-config-registry unset mail/cyrus/version 2>/dev/null || :
+        ucr unset mail/cyrus/version 2>/dev/null || :
 
         # stop saslauthd
         if [ -x /etc/init.d/saslauthd ]; then
diff --git a/ucs/debian/kolab-imap.preinst b/ucs/debian/kolab-imap.preinst
index 929128d..0e410a7 100755
--- a/ucs/debian/kolab-imap.preinst
+++ b/ucs/debian/kolab-imap.preinst
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-eval $(ucr shell)
+#DEBHELPER#
+
+eval "$(ucr shell)"
 
 if [ ! -e "/etc/cyrus.secret" ]; then
     touch /etc/cyrus.secret
diff --git a/ucs/debian/kolab-imap.prerm b/ucs/debian/kolab-imap.prerm
index 49e919a..a080380 100755
--- a/ucs/debian/kolab-imap.prerm
+++ b/ucs/debian/kolab-imap.prerm
@@ -1,5 +1,6 @@
 #!/bin/bash
-# Pre-removal script for kolabsys-mail-cyrus-kolab2
+
+#DEBHELPER#
 
 case "$1" in
 	upgrade|update)
diff --git a/ucs/debian/kolab-imap.univention-config-registry b/ucs/debian/kolab-imap.univention-config-registry
index 39188ff..bd473b3 100644
--- a/ucs/debian/kolab-imap.univention-config-registry
+++ b/ucs/debian/kolab-imap.univention-config-registry
@@ -1,5 +1,7 @@
 Type: file
 File: etc/imapd.conf
+Variables: domainname
+Variables: hostname
 Variables: mail/cyrus/mailbox/rename
 Variables: mail/cyrus/murder/backend/id
 Variables: mail/cyrus/admins
@@ -7,11 +9,11 @@ Variables: mail/cyrus/imap/quotawarnpercent
 Variables: mail/cyrus/imap/quotawarnkb
 Variables: mail/cyrus/idlemethod
 Variables: mail/hosteddomains
-Variables: domainname
 Variables: mail/cyrus/murder/master
-Variables: hostname
 Variables: mail/cyrus/murder/backends
 Variables: mail/cyrus/murder/frontends
+Variables: mail/cyrus/ssl/certificate
+Variables: mail/cyrus/ssl/key
 Variables: ldap/base
 Variables: ldap/server/name
 Variables: ldap/server/port





More information about the commits mailing list