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

Copy lemon conf too

Browse source
This commit is contained in:
Kload 2013-02-26 18:49:08 +01:00
parent e66680014e
commit afe7705336
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
yunohost_app.py
View file

@ -13,7 +13,7 @@ apps_path = '/usr/share/yunohost/apps'
install_tmp = '/tmp/yunohost/install' install_tmp = '/tmp/yunohost/install'
app_tmp_folder = install_tmp + '/from_file' app_tmp_folder = install_tmp + '/from_file'
a2_template_path = '/etc/yunohost/apache/templates' a2_template_path = '/etc/yunohost/apache/templates'
a2_domains_path = '/etc/yunohost/apache/domains' a2_app_conf_path = '/etc/yunohost/apache/domains'
lemon_tmp_conf = '/tmp/tmplemonconf' lemon_tmp_conf = '/tmp/tmplemonconf'
def app_listlists(): def app_listlists():
@ -357,17 +357,19 @@ def _apache_config(domain):
""" """
# TMP: remove old conf # TMP: remove old conf
if os.path.exists(a2_domains_path +'/'+ domain +'.conf'): os.remove(a2_domains_path +'/'+ domain +'.conf') if os.path.exists(a2_app_conf_path +'/'+ domain +'.conf'): os.remove(a2_app_conf_path +'/'+ domain +'.conf')
if os.path.exists(a2_domains_path +'/'+ domain +'.d/'): shutil.rmtree(a2_domains_path +'/'+ domain +'.d/') if os.path.exists(a2_app_conf_path +'/'+ domain +'.d/'): shutil.rmtree(a2_app_conf_path +'/'+ domain +'.d/')
try: os.listdir(a2_domains_path +'/'+ domain +'.d/') try: os.listdir(a2_app_conf_path +'/'+ domain +'.d/')
except OSError: os.makedirs(a2_domains_path +'/'+ domain +'.d/') except OSError: os.makedirs(a2_app_conf_path +'/'+ domain +'.d/')
with open(a2_domains_path +'/'+ domain +'.conf', 'a') as a2_conf: with open(a2_app_conf_path +'/'+ domain +'.conf', 'a') as a2_conf:
for line in open(a2_template_path +'/template.conf.tmp'): for line in open(a2_template_path +'/template.conf.tmp'):
line = line.replace('[domain]',domain) line = line.replace('[domain]',domain)
a2_conf.write(line) a2_conf.write(line)
os.system('cp "'+ a2_template_path + '/fixed.sso.conf" "'+ a2_app_conf_path +'/'+ domain +'.d/"')
if os.system('service apache2 reload') == 0: if os.system('service apache2 reload') == 0:
win_msg(_("Apache configured")) win_msg(_("Apache configured"))
else: else: