Request 1234 (accepted)

Overview

Request 1234 (accepted)

Check in 0.7.18

Created by vanmeeuwen over 8 years ago
In state accepted

Submit pykolab

Submit package Kolab:Development / pykolab to package Kolab:16 / pykolab

0005-cli-kolab-sync-now-properly-creates-mailboxes-3975.patch Deleted

@@ -1,37 +0,0 @@
-From a6984e9e29a3cd6beca7f717ad3484e846358fbc Mon Sep 17 00:00:00 2001
-From: Timotheus Pokorra <tp@tbits.net>
-Date: Fri, 29 May 2015 14:52:56 +0200
-Subject: [PATCH 5/7] cli: kolab sync now properly creates mailboxes (#3975)
-
-value of entry was not assigned properly.
-and we need to wait for the creation to finish
----
- pykolab/cli/cmd_sync.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/pykolab/cli/cmd_sync.py b/pykolab/cli/cmd_sync.py
-index 3e2191a..b9c6c9e 100644
---- a/pykolab/cli/cmd_sync.py
-+++ b/pykolab/cli/cmd_sync.py
-@@ -100,7 +100,8 @@ def queue_add(*args, **kw):
-     global pool
-     for dn, entry in kw['entry']:
-         entry['dn'] = dn
--        pool.apply_async(_synchronize, (), dict(**entry))
-+        r = pool.apply_async(_synchronize, (), dict(**entry))
-+        r.wait()
- 
- def worker_process(*args, **kw):
-     pass
-@@ -108,7 +109,7 @@ def worker_process(*args, **kw):
- def _synchronize(*args, **kw):
-     log.info(_("Worker process %s handling %s") % (multiprocessing.current_process().name, kw['dn']))
- 
--    entry = utils.normalize(entry)
-+    entry = utils.normalize(kw)
- 
-     if not entry.has_key('mail'):
-         return
--- 
-1.9.3
-

pykolab-0.7.18.tar.gz/configure.ac Changed

pykolab-0.7.18.tar.gz/pykolab/setup/setup_manticore.py Added

@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+# Copyright 2010-2016 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# 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, see <http://www.gnu.org/licenses/>.
+#
+
+from Cheetah.Template import Template
+import hashlib
+import os
+import random
+import re
+import subprocess
+import sys
+import time
+
+import components
+
+import pykolab
+
+from pykolab import utils
+from pykolab.constants import *
+from pykolab.translate import _
+
+log = pykolab.getLogger('pykolab.setup')
+conf = pykolab.getConf()
+
+def __init__():
+    components.register('manticore', execute, description=description(), after=['ldap','roundcube'])
+
+def description():
+    return _("Setup Manticore.")
+
+def execute(*args, **kw):
+    if not os.path.isfile('/etc/manticore/local.env.js'):
+        log.error(_("Manticore is not installed on this system"))
+        return
+
+    manticore_settings = {
+            'fqdn': hostname + '.' + domainname,
+            'secret': re.sub(
+                    r'[^a-zA-Z0-9]',
+                    "",
+                    "%s%s" % (
+                            hashlib.md5("%s" % random.random()).digest().encode("base64"),
+                            hashlib.md5("%s" % random.random()).digest().encode("base64")
+                        )
+                )[:24],
+            'server_host': utils.parse_ldap_uri(conf.get('ldap', 'ldap_uri'))[1],
+            'auth_key': re.sub(
+                    r'[^a-zA-Z0-9]',
+                    "",
+                    "%s%s" % (
+                            hashlib.md5("%s" % random.random()).digest().encode("base64"),
+                            hashlib.md5("%s" % random.random()).digest().encode("base64")
+                        )
+                )[:24],
+            'service_bind_dn': conf.get('ldap', 'service_bind_dn'),
+            'service_bind_pw': conf.get('ldap', 'service_bind_pw'),
+            'user_base_dn': conf.get('ldap', 'user_base_dn')
+        }
+
+    if os.path.isfile('/etc/kolab/templates/manticore.js.tpl'):
+        fp = open('/etc/kolab/templates/manticore.js.tpl','r')
+    else:
+        fp = open('/usr/share/kolab/templates/manticore.js.tpl', 'r')
+
+    template_definition = fp.read()
+    fp.close()
+
+    t = Template(template_definition, searchList=[manticore_settings])
+
+    fp = open('/etc/manticore/local.env.js', 'w')
+    fp.write(t.__str__())
+    fp.close()
+
+    if os.path.isfile('/bin/systemctl'):
+        subprocess.call(['/bin/systemctl', 'restart', 'mongod'])
+        time.sleep(5)
+        subprocess.call(['/bin/systemctl', 'restart', 'manticore'])
+    else:
+        log.error(_("Could not start the manticore service."))
+
+    if os.path.isfile('/bin/systemctl'):
+        subprocess.call(['/bin/systemctl', 'enable', 'mongod'])
+        subprocess.call(['/bin/systemctl', 'enable', 'manticore'])
+    else:
+        log.error(_("Could not configure the manticore service to start on boot"))
+

pykolab-0.7.18.tar.gz/share/templates/manticore.js.tpl Added

pykolab-0.7.18.tar.gz/share/templates/roundcubemail/config.inc.php.tpl Changed

pykolab-0.7.18.tar.gz/share/templates/roundcubemail/kolab_files.inc.php.tpl Changed

Build Results
RPM Lint

Refresh

Comments for request 1234 0

Request History

vanmeeuwen created request over 8 years ago

Check in 0.7.18

vanmeeuwen accepted review over 8 years ago

vanmeeuwen approved review over 8 years ago

vanmeeuwen accepted request over 8 years ago