make webapp have their own apache conf files

This commit is contained in:
titoko 2013-07-17 17:33:45 +02:00
parent ac59954aee
commit 5476f1c799

View file

@ -511,21 +511,23 @@ def app_install(app, domain, path='/', label=None, mode='private'):
########## ##########
# Apache # # Apache #
########## ##########
if lvl(manifest,'yunohost','webapp','custom_apache_conf'):
os.system('mv '+app_tmp_folder+'/'+manifest['yunohost']['webapp']['custom_apache_conf']+' '++a2_settings_path +'/'+ domain +'.d/'+ unique_app_id +'.app.conf')
else:
a2_conf_lines = [ 'Alias '+ path +' '+ app_final_path + manifest['launch_path'] ]
if path != '/':
a2_conf_lines.append('Alias '+ path[:len(path)-1] +' '+ app_final_path + manifest['launch_path'])
a2_conf_lines = [ 'Alias '+ path +' '+ app_final_path + manifest['launch_path'] ] a2_conf_lines.append('<Directory '+ app_final_path +'>')
if path != '/':
a2_conf_lines.append('Alias '+ path[:len(path)-1] +' '+ app_final_path + manifest['launch_path'])
a2_conf_lines.append('<Directory '+ app_final_path +'>') if lvl(manifest, 'yunohost', 'webapp', 'language') and manifest['yunohost']['webapp']['language'] == 'php':
for line in open(a2_template_path +'/php.conf'): a2_conf_lines.append(line.rstrip())
if lvl(manifest, 'yunohost', 'webapp', 'language') and manifest['yunohost']['webapp']['language'] == 'php': a2_conf_lines.append('</Directory>')
for line in open(a2_template_path +'/php.conf'): a2_conf_lines.append(line.rstrip())
a2_conf_lines.append('</Directory>') with open(a2_settings_path +'/'+ domain +'.d/'+ unique_app_id +'.app.conf', 'w') as a2_conf:
for line in a2_conf_lines:
with open(a2_settings_path +'/'+ domain +'.d/'+ unique_app_id +'.app.conf', 'w') as a2_conf: a2_conf.write(line + '\n')
for line in a2_conf_lines:
a2_conf.write(line + '\n')
######################################### #########################################