Request 1240 (accepted)

This request supersedes: request 1239 (Show diff)

Overview

Request 1240 (accepted)

Check in 0.8.0

Created by vanmeeuwen over 8 years ago
In state accepted
Supersedes 1239

Submit pykolab

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

pykolab.spec Changed

0001-Fix-typo-in-template.patch Deleted

@@ -1,25 +0,0 @@
-From e1604138c96031230e80cac125fbed3c409324d7 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Mon, 18 Jan 2016 16:28:55 +0100
-Subject: [PATCH] Fix typo in template
-
----
- share/templates/roundcubemail/kolab_files.inc.php.tpl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/share/templates/roundcubemail/kolab_files.inc.php.tpl b/share/templates/roundcubemail/kolab_files.inc.php.tpl
-index 486c866..5720ee9 100644
---- a/share/templates/roundcubemail/kolab_files.inc.php.tpl
-+++ b/share/templates/roundcubemail/kolab_files.inc.php.tpl
-@@ -16,7 +16,7 @@
- \$config['kolab_files_search_threads'] = 1;
- 
- // LDAP addressbook that would be searched for user names autocomplete.
--// That should be an array refering to the $config['ldap_public'] array key
-+// That should be an array refering to the \$config['ldap_public'] array key
- // or complete addressbook configuration array.
- \$config['kolab_files_users_source'] = 'kolab_addressbook';
- 
--- 
-2.4.3
-

debian.changelog Changed

debian.series Changed

pykolab-0.7.18.tar.gz/.gitignore -> pykolab-0.8.0.tar.gz/.gitignore Changed

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

pykolab-0.7.18.tar.gz/pykolab/Makefile.am -> pykolab-0.8.0.tar.gz/pykolab/Makefile.am Changed

pykolab-0.7.18.tar.gz/pykolab/imap/__init__.py -> pykolab-0.8.0.tar.gz/pykolab/imap/__init__.py Changed

pykolab-0.8.0.tar.gz/pykolab/setup/setup_guam.py Added

@@ -0,0 +1,64 @@
+# -*- 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/>.
+#
+
+import os
+import shutil
+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('guam', execute, description=description())
+
+def description():
+    return _("Setup Guam.")
+
+def execute(*args, **kw):
+    if not os.path.isfile('/etc/guam/sys.config'):
+        log.error(_("Guam is not installed on this system"))
+        return
+
+    if os.path.isfile('/etc/kolab/templates/guam.sys.config.tpl'):
+        template = '/etc/kolab/templates/guam.sys.config.tpl'
+    else:
+        template = '/usr/share/kolab/templates/guam.sys.config.tpl'
+
+    shutil.copyfile(template, '/etc/guam/sys.config')
+
+    if os.path.isfile('/bin/systemctl'):
+        subprocess.call(['/bin/systemctl', 'restart', 'guam'])
+    else:
+        log.error(_("Could not start the guam service."))
+
+    if os.path.isfile('/bin/systemctl'):
+        subprocess.call(['/bin/systemctl', 'enable', 'guam'])
+    else:
+        log.error(_("Could not configure the guam service to start on boot"))
+

pykolab-0.7.18.tar.gz/share/templates/cyrus.conf.tpl -> pykolab-0.8.0.tar.gz/share/templates/cyrus.conf.tpl Changed

@@ -2,33 +2,22 @@
 
 START {
     # do not delete this entry!
-    recover	cmd="ctl_cyrusdb -r"
+    recover	    cmd="ctl_cyrusdb -r"
 
-    # this is only necessary if using idled for IMAP IDLE
-    idled		cmd="idled"
+    idled       cmd="idled"
 }
 
 # UNIX sockets start with a slash and are put into /var/lib/imap/sockets
 SERVICES {
-    # add or remove based on preferences
-    imap		cmd="imapd" listen="imap" prefork=5
-    imaps		cmd="imapd -s" listen="imaps" prefork=1
-    pop3		cmd="pop3d" listen="pop3" prefork=3
-    pop3s		cmd="pop3d -s" listen="pop3s" prefork=1
-    sieve		cmd="timsieved" listen="sieve" prefork=0
+    imaps       cmd="imapd -s"  listen="127.0.0.1:9993"                 prefork=5
 
-    ptloader    cmd="ptloader" listen="/var/lib/imap/ptclient/ptsock" prefork=0
+    sieve       cmd="timsieved" listen="sieve"                          prefork=0
 
-    # these are only necessary if receiving/exporting usenet via NNTP
-    #nntp		cmd="nntpd" listen="nntp" prefork=3
-    #nntps		cmd="nntpd -s" listen="nntps" prefork=1
+    ptloader    cmd="ptloader"  listen="/var/lib/imap/ptclient/ptsock"  prefork=0
 
-    # at least one LMTP is required for delivery
-    #lmtp		cmd="lmtpd" listen="lmtp" prefork=0
-    lmtpunix	cmd="lmtpd" listen="/var/lib/imap/socket/lmtp" prefork=1
+    lmtpunix    cmd="lmtpd"     listen="/var/lib/imap/socket/lmtp"      prefork=1
 
-    # this is only necessary if using notifications
-    notify	cmd="notifyd" listen="/var/lib/imap/socket/notify" proto="udp" prefork=1
+    notify      cmd="notifyd"   listen="/var/lib/imap/socket/notify"    proto="udp" prefork=1
 }
 
 EVENTS {

pykolab-0.8.0.tar.gz/share/templates/guam.sys.config.tpl Added

@@ -0,0 +1,78 @@
+%% Example configuration for Guam.
+[
+    {
+        kolab_guam, [
+            {
+                imap_servers, [
+                    {
+                        imaps, [
+                            { host, "127.0.0.1" },
+                            { port, 9993 },
+                            { tls, true }
+                        ]
+                    }
+                ]
+            },
+            {
+                listeners, [
+                    {
+                        imap, [
+                            { port, 143 },
+                            { imap_server, imap },
+                            {
+                                rules, [
+                                    { filter_groupware, [] }
+                                ]
+                            },
+                            {
+                                tls_config, [
+                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        imaps, [
+                            { port, 993 },
+                            { implicit_tls, true },
+                            { imap_server, imaps },
+                            {
+                                rules, [
+                                    { filter_groupware, [] }
+                                ]
+                            },
+                            {
+                                tls_config, [
+                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+
+    {
+        lager, [
+            {
+                handlers, [
+                    { lager_console_backend, warning },
+                    { lager_file_backend, [ { file, "log/error.log"}, { level, error } ] },
+                    { lager_file_backend, [ { file, "log/console.log"}, { level, info } ] }
+                ]
+            }
+        ]
+    },
+
+    %% SASL config
+    {
+        sasl, [
+            { sasl_error_logger, { file, "log/sasl-error.log" } },
+            { errlog_type, error },
+            { error_logger_mf_dir, "log/sasl" },      % Log directory
+            { error_logger_mf_maxbytes, 10485760 },   % 10 MB max file size
+            { error_logger_mf_maxfiles, 5 }           % 5 files max
+        ]
+    }
+].

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

pykolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 1240 0

Request History

vanmeeuwen created request over 8 years ago

Check in 0.8.0

vanmeeuwen accepted review over 8 years ago

vanmeeuwen approved review over 8 years ago

vanmeeuwen accepted request over 8 years ago