2 commits - pykolab/setup
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Sun Nov 24 23:18:27 CET 2013
pykolab/setup/setup_ldap.py | 2 ++
pykolab/setup/setup_roundcube.py | 5 -----
pykolab/setup/setup_syncroton.py | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 8f8236df2b81128a45185b3e4b91d24956e2a933
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun Nov 24 23:13:33 2013 +0100
Make sure the input domain is the first in the storage order (#2585)
diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index 2681160..66c5d41 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -587,6 +587,8 @@ ServerAdminPwd = %(admin_pass)s
# De-duplicate attribute values before attempting to insert the object (#2205)
attrs['associateddomain'] = list(set(attrs['associateddomain']))
+ attrs['associateddomain'].pop(attrs['associateddomain'].index(_input['domain']))
+ attrs['associateddomain'] = [ _input['domain'] ] + attrs['associateddomain']
attrs['aci'] = '(targetattr = "*") (version 3.0;acl "Read Access for %(domain)s Users";allow (read,compare,search)(userdn = "ldap:///%(rootdn)s??sub?(objectclass=*)");)' % (_input)
commit dada49f8283803b8519c94e4feca4fdbff8acf85
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun Nov 24 20:11:22 2013 +0100
Remove horde_cache.sql, correct syncroton.sql -> mysql.initial.sql
diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
index fef4d4a..b53a314 100644
--- a/pykolab/setup/setup_roundcube.py
+++ b/pykolab/setup/setup_roundcube.py
@@ -142,11 +142,6 @@ def execute(*args, **kw):
if not schema_filepath in schema_files:
schema_files.append(schema_filepath)
- if filename.startswith('horde_cache') and filename.endswith('.sql'):
- schema_filepath = os.path.join(root,filename)
- if not schema_filepath in schema_files:
- schema_files.append(schema_filepath)
-
if os.path.isdir('/usr/share/roundcubemail'):
rcpath = '/usr/share/roundcubemail/'
elif os.path.isdir('/usr/share/roundcube'):
diff --git a/pykolab/setup/setup_syncroton.py b/pykolab/setup/setup_syncroton.py
index f902f57..0722882 100644
--- a/pykolab/setup/setup_syncroton.py
+++ b/pykolab/setup/setup_syncroton.py
@@ -43,7 +43,7 @@ def execute(*args, **kw):
schema_files = []
for root, directories, filenames in os.walk('/usr/share/doc/'):
for filename in filenames:
- if filename.startswith('syncroton') and filename.endswith('.sql'):
+ if filename.startswith('mysql.initial') and filename.endswith('.sql'):
schema_filepath = os.path.join(root,filename)
if not schema_filepath in schema_files:
schema_files.append(schema_filepath)
More information about the commits
mailing list