3 commits - pykolab/conf pykolab/setup saslauthd/__init__.py saslauthd/kolab-saslauthd.sysvinit share/templates
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Tue Aug 19 12:23:34 CEST 2014
pykolab/conf/__init__.py | 10 ++++++++++
pykolab/setup/setup_mta.py | 2 ++
saslauthd/__init__.py | 9 +++++++++
saslauthd/kolab-saslauthd.sysvinit | 4 ++++
share/templates/roundcubemail/kolab_folders.inc.php.tpl | 8 +++++---
5 files changed, 30 insertions(+), 3 deletions(-)
New commits:
commit 129472ff828b3d1789c60eaecd2b90acdeb9baf5
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Tue Aug 19 11:55:26 2014 +0200
Fix #3418 and add new default folders
diff --git a/share/templates/roundcubemail/kolab_folders.inc.php.tpl b/share/templates/roundcubemail/kolab_folders.inc.php.tpl
index 93f6eec..4be282e 100644
--- a/share/templates/roundcubemail/kolab_folders.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab_folders.inc.php.tpl
@@ -2,9 +2,11 @@
\$config['kolab_folders_configuration_default'] = 'Configuration';
\$config['kolab_folders_event_default'] = 'Calendar';
\$config['kolab_folders_contact_default'] = 'Contacts';
- \$config['kolab_folders_task_default'] = '';
- \$config['kolab_folders_note_default'] = '';
- \$config['kolab_folders_journal_default'] = '';
+ \$config['kolab_folders_task_default'] = 'Tasks';
+ \$config['kolab_folders_note_default'] = 'Notes';
+ \$config['kolab_folders_file_default'] = 'Files';
+ \$config['kolab_folders_freebusy_default'] = 'Freebusy';
+ \$config['kolab_folders_journal_default'] = 'Journal';
\$config['kolab_folders_mail_inbox'] = 'INBOX';
\$config['kolab_folders_mail_drafts'] = 'Drafts';
\$config['kolab_folders_mail_sentitems'] = 'Sent';
commit ec2dc345c803ed50dfd81c497ba85b8ed45b31c9
Author: Aeneas JaiÃle <aj at ajaissle.de>
Date: Tue Aug 19 11:36:11 2014 +0200
Add /etc/amavisd.conf as possible amavisd configuration file
diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index f38ee07..166b402 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -388,6 +388,8 @@ result_format = shared+%%s
fp = open('/etc/amavisd/amavisd.conf', 'w')
elif os.path.isdir('/etc/amavis'):
fp = open('/etc/amavis/amavisd.conf', 'w')
+ elif os.path.isfile('/etc/amavisd.conf'):
+ fp = open('/etc/amavisd.conf', 'w')
if not fp == None:
fp.write(t.__str__())
commit f40f94e60cdb3b07c76408acf9d64f680a0b82ab
Author: Aeneas JaiÃle <aj at ajaissle.de>
Date: Tue Aug 19 11:35:02 2014 +0200
This patch adds an option '--socket' that can be used when starting kolab-saslauthd, to specify the socket file to bind to.
diff --git a/pykolab/conf/__init__.py b/pykolab/conf/__init__.py
index 030a626..e05f140 100644
--- a/pykolab/conf/__init__.py
+++ b/pykolab/conf/__init__.py
@@ -590,6 +590,16 @@ class Conf(object):
except IOError, e:
log.error(_("Cannot start SASL authentication daemon"))
return False
+ elif os.path.isfile("/var/run/sasl2/mux"):
+ if os.path.isfile("/var/run/sasl2/saslauthd.pid"):
+ log.error(_("Cannot start SASL authentication daemon"))
+ return False
+ else:
+ try:
+ os.remove("/var/run/sasl2/mux")
+ except IOError, e:
+ log.error(_("Cannot start SASL authentication daemon"))
+ return False
return True
def check_setting_use_imap(self, value):
diff --git a/saslauthd/__init__.py b/saslauthd/__init__.py
index 32927a8..b7f81d5 100644
--- a/saslauthd/__init__.py
+++ b/saslauthd/__init__.py
@@ -68,6 +68,15 @@ class SASLAuthDaemon(object):
)
daemon_group.add_option(
+ "-s",
+ "--socket",
+ dest = "socketfile",
+ action = "store",
+ default = "/var/run/saslauthd/mux",
+ help = _("Socket file to bind to.")
+ )
+
+ daemon_group.add_option(
"-u",
"--user",
dest = "process_username",
diff --git a/saslauthd/kolab-saslauthd.sysvinit b/saslauthd/kolab-saslauthd.sysvinit
index 033bbc7..5090a65 100644
--- a/saslauthd/kolab-saslauthd.sysvinit
+++ b/saslauthd/kolab-saslauthd.sysvinit
@@ -24,7 +24,11 @@ if [ -f /etc/init.d/functions ]; then
fi
# Source our configuration file for these variables.
+if [[ -d /var/run/sasl2 ]]; then
+SOCKETDIR=/var/run/sasl2
+else
SOCKETDIR=/var/run/saslauthd
+fi
FLAGS="--fork -l warning"
if [ -f /etc/sysconfig/kolab-saslauthd ] ; then
More information about the commits
mailing list