From 4902c1d34d09da59dfb328629f504d6ee619edcf Mon Sep 17 00:00:00 2001 From: Kload Date: Fri, 11 Oct 2013 04:13:47 +0200 Subject: [PATCH] fixes --- yunohost.py | 1 - yunohost_domain.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/yunohost.py b/yunohost.py index 92d1b0d4..052ec1b9 100644 --- a/yunohost.py +++ b/yunohost.py @@ -44,7 +44,6 @@ if not __debug__: import traceback win = [] -lemon_tmp_conf = '/tmp/tmplemonconf' def random_password(length=8): char_set = string.ascii_uppercase + string.digits + string.ascii_lowercase diff --git a/yunohost_domain.py b/yunohost_domain.py index c9f97e18..edcfdae6 100644 --- a/yunohost_domain.py +++ b/yunohost_domain.py @@ -34,7 +34,6 @@ from yunohost_tools import tools_lemonrule a2_template_path = '/etc/yunohost/apache/templates' a2_app_conf_path = '/etc/yunohost/apache/domains' -lemon_tmp_conf = '/tmp/tmplemonconf' def domain_list(filter=None, limit=None, offset=None): """ @@ -74,7 +73,7 @@ def domain_add(domains, raw=False, main=False): Keyword argument: domains -- Domain name to add - raw -- Auto-configure Apache and LemonLDAP for the domain + raw -- Do not configure Apache and LemonLDAP for the domain """ with YunoHostLDAP() as yldap: @@ -126,7 +125,8 @@ def domain_add(domains, raw=False, main=False): (('vhostOptions', domain, 'vhostHttps'), -1), (('locationRules', domain, 'default'), 'accept') ] - for lemonrule in lemonrules: tools_lemonrule(*lemonrule) + for lemonrule in lemonrules: + tools_lemonrule(*lemonrule) tools_lemonrule(apply=True) _apache_config(domain)