YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixes

Browse source
This commit is contained in:
Kload 2013-10-11 04:13:47 +02:00
parent ebce032ce9
commit 4902c1d34d
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
yunohost.py
View file

@ -44,7 +44,6 @@ if not __debug__:
import traceback import traceback
win = [] win = []
lemon_tmp_conf = '/tmp/tmplemonconf'
def random_password(length=8): def random_password(length=8):
char_set = string.ascii_uppercase + string.digits + string.ascii_lowercase char_set = string.ascii_uppercase + string.digits + string.ascii_lowercase

6
yunohost_domain.py
View file

@ -34,7 +34,6 @@ from yunohost_tools import tools_lemonrule
a2_template_path = '/etc/yunohost/apache/templates' a2_template_path = '/etc/yunohost/apache/templates'
a2_app_conf_path = '/etc/yunohost/apache/domains' a2_app_conf_path = '/etc/yunohost/apache/domains'
lemon_tmp_conf = '/tmp/tmplemonconf'
def domain_list(filter=None, limit=None, offset=None): def domain_list(filter=None, limit=None, offset=None):
""" """
@ -74,7 +73,7 @@ def domain_add(domains, raw=False, main=False):
Keyword argument: Keyword argument:
domains -- Domain name to add 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: with YunoHostLDAP() as yldap:
@ -126,7 +125,8 @@ def domain_add(domains, raw=False, main=False):
(('vhostOptions', domain, 'vhostHttps'), -1), (('vhostOptions', domain, 'vhostHttps'), -1),
(('locationRules', domain, 'default'), 'accept') (('locationRules', domain, 'default'), 'accept')
] ]
for lemonrule in lemonrules: tools_lemonrule(*lemonrule) for lemonrule in lemonrules:
tools_lemonrule(*lemonrule)
tools_lemonrule(apply=True) tools_lemonrule(apply=True)
_apache_config(domain) _apache_config(domain)