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

Merge 77e791c3be into ac59954aee

Browse source
This commit is contained in:
titoko 2013-07-19 01:18:21 -07:00
commit 303b36aafc
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
yunohost_app.py
View file

@ -332,6 +332,7 @@ def app_upgrade(app, instance=[], url=None, file=None):
os.system('cp -a "'+ app_tmp_folder +'" "'+ app_final_path +'"')
if is_web:
if app_type != 'privileged' and app_type != 'certified':
os.system('chown -R www-data: "'+ app_final_path +'"')
os.system('service apache2 reload')
shutil.rmtree(app_final_path + manifest['yunohost']['script_path'])
@ -511,7 +512,9 @@ def app_install(app, domain, path='/', label=None, mode='private'):
##########
# 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'])
@ -541,6 +544,7 @@ def app_install(app, domain, path='/', label=None, mode='private'):
os.system('cp -a "'+ app_tmp_folder +'" "'+ app_final_path +'"')
if is_web:
if app_type != 'privileged' and app_type != 'certified':
os.system('chown -R www-data: "'+ app_final_path +'"')
os.system('service apache2 reload')
shutil.rmtree(app_final_path + manifest['yunohost']['script_path'])