8 commits - configure.ac pykolab/auth pykolab/conf pykolab/Makefile.am pykolab.spec.in share/templates
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Fri May 4 17:17:16 CEST 2012
configure.ac | 2 +-
pykolab.spec.in | 1 +
pykolab/Makefile.am | 2 ++
pykolab/auth/ldap/__init__.py | 18 ++++++++++++++++++
pykolab/conf/defaults.py | 1 +
share/templates/roundcubemail/main.inc.php.tpl | 2 +-
6 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit 4fa4da38d3d8ecdc0aee090605aaa5ea0e0de0bc
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri May 4 16:17:04 2012 +0100
Actually set entry attributes
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index 98acb0c..5f9bab5 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -654,10 +654,25 @@ class LDAP(pykolab.base.Base):
entry_dn = self.entry_dn(entry_id)
+ entry = self.get_entry_attributes(entry_dn, ['*'])
+
attrs = {}
for attribute in attributes.keys():
attrs[attribute.lower()] = attributes[attribute]
+ modlist = []
+
+ for attribute in attrs.keys():
+ if not entry.has_key(attribute):
+ entry[attribute] = self.get_entry_attribute(entry_id, attribute)
+
+ for attribute in attrs.keys():
+ if entry.has_key(attribute) and entry[attribute] == None:
+ modlist.append((ldap.MOD_ADD, attribute, attrs[attribute]))
+
+ dn = entry_dn
+ self.ldap.modify_s(dn, modlist)
+
def synchronize(self):
"""
Synchronize with LDAP
commit 193061bb0bbdfdac9fa537371f5fd395cf9cf5a4
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri May 4 14:04:59 2012 +0100
Bump pre-release
diff --git a/configure.ac b/configure.ac
index d326d3b..a812831 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([pykolab], 0.4)
-AC_SUBST([RELEASE], 0.7)
+AC_SUBST([RELEASE], 0.8)
AC_CONFIG_SRCDIR(pykolab/constants.py.in)
commit 79958158335ff95370f915ed55bcf04028875e43
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri May 4 14:04:15 2012 +0100
This is where the actual default should come from, but pykolab/base.py:def config_get doesn't take into account the defaults
diff --git a/pykolab/conf/defaults.py b/pykolab/conf/defaults.py
index 669aee3..e1e34ab 100644
--- a/pykolab/conf/defaults.py
+++ b/pykolab/conf/defaults.py
@@ -31,6 +31,7 @@ class Defaults(object):
self.address_search_attrs = ['mail', 'alias']
self.mail_attributes = ['mail', 'alias']
+ self.mailserver_attribute = 'mailhost'
self.kolab_default_locale = 'en_US'
self.ldap_unique_attribute = 'nsuniqueid'
\ No newline at end of file
commit fff443ef7205c03ee51747414b1ca6f686e212a0
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri May 4 14:04:00 2012 +0100
Make sure a default mailserver_attribute is set
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index 4ad9d5b..98acb0c 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -714,6 +714,9 @@ class LDAP(pykolab.base.Base):
An entry of type user was added.
"""
mailserver_attribute = self.config_get('mailserver_attribute')
+ if mailserver_attribute == None:
+ mailserver_attribute = 'mailhost'
+
result_attribute = conf.get('cyrus-sasl', 'result_attribute')
if not entry.has_key(mailserver_attribute):
commit 45c5bea87be934124f92a08333541e0c80e8fd04
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri May 4 14:02:12 2012 +0100
Use the default theme
diff --git a/share/templates/roundcubemail/main.inc.php.tpl b/share/templates/roundcubemail/main.inc.php.tpl
index 030e239..505e768 100644
--- a/share/templates/roundcubemail/main.inc.php.tpl
+++ b/share/templates/roundcubemail/main.inc.php.tpl
@@ -139,7 +139,7 @@
\$rcmail_config['product_name'] = 'Kolab Groupware';
- \$rcmail_config['skin'] = 'kolab';
+ \$rcmail_config['skin'] = 'default';
\$rcmail_config['skin_logo'] = 'skins/kolab/images/kolab_logo.png';
\$rcmail_config['skin_include_php'] = false;
\$rcmail_config['mime_magic'] = '/usr/share/misc/magic';
commit b863d25bc9570bbf0d0d4258ff979fb6301d2b53
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri May 4 01:01:31 2012 +0100
Bump pre-release
diff --git a/configure.ac b/configure.ac
index 9f0bb8b..d326d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([pykolab], 0.4)
-AC_SUBST([RELEASE], 0.6)
+AC_SUBST([RELEASE], 0.7)
AC_CONFIG_SRCDIR(pykolab/constants.py.in)
commit edb5a0145ff597793b9bc0134647317ed1ad365a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri May 4 01:01:07 2012 +0100
Also require python-cheetah
diff --git a/pykolab.spec.in b/pykolab.spec.in
index 9b89889..ff34e30 100644
--- a/pykolab.spec.in
+++ b/pykolab.spec.in
@@ -55,6 +55,7 @@ Group: Applications/System
BuildRequires: intltool, gettext, python
Requires: %{name} = %{version}-%{release}
Requires: python-augeas
+Requires: python-cheetah
%description -n kolab-cli
Kolab CLI utilities
commit 7778863a0fe5ed03460ba7ed3226de1c6737e36f
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri May 4 01:00:49 2012 +0100
Include more components to setup
diff --git a/pykolab/Makefile.am b/pykolab/Makefile.am
index db236a9..b4758b6 100644
--- a/pykolab/Makefile.am
+++ b/pykolab/Makefile.am
@@ -52,8 +52,10 @@ pykolab_setupdir = $(pythondir)/$(PACKAGE)/setup
pykolab_setup_PYTHON = \
setup/components.py \
setup/setup_imap.py \
+ setup/setup_kolabd.py \
setup/setup_ldap.py \
setup/setup_mta.py \
+ setup/setup_mysql.py \
setup/setup_roundcube.py \
setup/__init__.py
More information about the commits
mailing list