Branch 'pykolab-0.6' - 6 commits - bin/kolab_smtp_access_policy.py pykolab/setup
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Fri Feb 28 13:49:34 CET 2014
bin/kolab_smtp_access_policy.py | 2 +-
pykolab/setup/setup_ldap.py | 2 ++
pykolab/setup/setup_mta.py | 5 ++++-
pykolab/setup/setup_mysql.py | 5 ++++-
pykolab/setup/setup_roundcube.py | 2 +-
5 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 41b09cd702e6d9996dd05fed8c0b04b29eeb4dac
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Feb 28 13:39:21 2014 +0100
Different paths to a mysql sock or pid (#2879)
diff --git a/pykolab/setup/setup_mysql.py b/pykolab/setup/setup_mysql.py
index e9783c7..36a0bec 100644
--- a/pykolab/setup/setup_mysql.py
+++ b/pykolab/setup/setup_mysql.py
@@ -64,7 +64,10 @@ def execute(*args, **kw):
}
answer = 0
- if os.path.exists('/var/run/mysqld/mysqld.sock') or os.path.exists('/var/run/mysql/mysql.sock'):
+ if os.path.exists('/var/lib/mysql/mysql.sock') or \ # Regular old-fashioned Enterprise Linux
+ os.path.exists('/var/run/mysqld/mysqld.sock') or \ # Debian
+ os.path.exists('/var/run/mysql/mysql.sock') or \ # (open)SUSE
+ os.path.exists('/var/run/mysqld/mysqld.pid'): # "Unbreakable" Linux from Oracle
answer = utils.ask_menu(_("What MySQL server are we setting up?"), options)
if answer == "1" or answer == 1:
commit 90d01b8a48d816b06a08b94744972292143dbf17
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Feb 28 13:15:03 2014 +0100
Allow directories and files sought to be found in levels deeper than
just /use/share/doc/ (#2871)
diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
index e375f9b..4e14ee2 100644
--- a/pykolab/setup/setup_roundcube.py
+++ b/pykolab/setup/setup_roundcube.py
@@ -139,7 +139,7 @@ def execute(*args, **kw):
for root, directories, filenames in os.walk('/usr/share/doc/'):
for directory in directories:
if directory.startswith("roundcubemail"):
- for root, directories, filenames in os.walk(os.path.join('/usr/share/doc/', directory)):
+ for root, directories, filenames in os.walk(os.path.join(root, directory)):
for filename in filenames:
if filename.startswith('mysql.initial') and filename.endswith('.sql'):
schema_filepath = os.path.join(root,filename)
commit c5696ac7753e1a40243b65dac3a96c9b9c8b7af2
Author: Aeneas Jaißle <aj at ajaissle.de>
Date: Fri Feb 28 13:10:00 2014 +0100
With the attached patch, we (openSUSE) are able to identiify a running
MySQL server. Without, only /var/run/mysqld/mysqld.sock is checked, but
we use /var/run/mysql/mysql.sock (without a trailing 'd').
diff --git a/pykolab/setup/setup_mysql.py b/pykolab/setup/setup_mysql.py
index 4b2e8c2..e9783c7 100644
--- a/pykolab/setup/setup_mysql.py
+++ b/pykolab/setup/setup_mysql.py
@@ -64,7 +64,7 @@ def execute(*args, **kw):
}
answer = 0
- if os.path.exists('/var/run/mysqld/mysqld.sock'):
+ if os.path.exists('/var/run/mysqld/mysqld.sock') or os.path.exists('/var/run/mysql/mysql.sock'):
answer = utils.ask_menu(_("What MySQL server are we setting up?"), options)
if answer == "1" or answer == 1:
commit 8e29a511ce56f5c142df4dd5daf9797f6e072c4e
Author: Aeneas Jaißle <aj at ajaissle.de>
Date: Fri Feb 28 13:05:07 2014 +0100
setup_ldap knows about
* /usr/sbin/setup-ds-admin.pl
* /usr/sbin/setup-ds
but it does not know about setup-ds.pl, that comes with upstream
389-ds-base.
diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index 66c5d41..e974c69 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -317,6 +317,8 @@ ServerAdminPwd = %(admin_pass)s
setup_ds_admin = "/usr/sbin/setup-ds-admin.pl"
#elif os.path.isfile("/usr/sbin/setup-ds-admin"):
#setup_ds_admin = "/usr/sbin/setup-ds-admin"
+ elif os.path.isfile("/usr/sbin/setup-ds.pl"):
+ setup_ds_admin = "/usr/sbin/setup-ds.pl"
elif os.path.isfile("/usr/sbin/setup-ds"):
setup_ds_admin = "/usr/sbin/setup-ds"
else:
commit d12c31735e6726c503fd09e446cd4e2405ee8d7d
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Feb 28 13:00:00 2014 +0100
Fix indentation (#2872), fixing writing out amavisd (#2864)
Correct error message (#2868)
diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index 64b3317..3b064c6 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -383,15 +383,18 @@ result_format = shared+%%s
t = Template(template_definition, searchList=[amavisd_settings])
+ fp = None
if os.path.isdir('/etc/amavisd'):
fp = open('/etc/amavisd/amavisd.conf', 'w')
elif os.path.isdir('/etc/amavis'):
fp = open('/etc/amavis/amavisd.conf', 'w')
+
+ if not fp == None:
fp.write(t.__str__())
fp.close()
else:
- log.error(_("Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"))
+ log.error(_("Could not write out Amavis configuration file amavisd.conf"))
return
# On APT installations, /etc/amavis/conf.d/ is a directory with many more files.
commit 34ca3245f0ede2968a7f05d2aca108e79870ab70
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun Feb 16 13:05:27 2014 +0100
Fix typo
diff --git a/bin/kolab_smtp_access_policy.py b/bin/kolab_smtp_access_policy.py
index 935fc6e..0d3fa2f 100755
--- a/bin/kolab_smtp_access_policy.py
+++ b/bin/kolab_smtp_access_policy.py
@@ -1375,7 +1375,7 @@ def permit(message, policy_request=None):
# If the sender is using an alias as the envelope sender address, take
# into account the preferred domain policy for appending the Sender
# and/or X-Sender headers.
- elif policy_requiest.sasl_user_uses_alias:
+ elif policy_request.sasl_user_uses_alias:
# Domain-specific setting?
if not policy_request.sender_domain == None:
alias_sender_header = conf.get(policy_request.sender_domain, 'alias_sender_header')
More information about the commits
mailing list