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

Update yunohost_app.py

Browse source
This commit is contained in:
titoko 2013-12-03 21:02:34 +01:00
parent b333c5e5b4
commit acb4094193
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
yunohost_app.py
View file

@ -150,7 +150,7 @@ def app_list(offset=None, limit=None, filter=None, raw=False):
continue continue
with open( apps_setting_path + app +'/manifest.json') as json_manifest: with open( apps_setting_path + app +'/manifest.json') as json_manifest:
app_dict[app] = {"manifest":json.loads(str(json_manifest.read()))} app_dict[app] = {"manifest":json.loads(str(json_manifest.read()))}
app_dict[app]['manifest']['orphan']=True#{ 'orphan': True } app_dict[app]['manifest']['orphan']=True
if len(app_dict) > (0 + offset) and limit > 0: if len(app_dict) > (0 + offset) and limit > 0:
sorted_app_dict = {} sorted_app_dict = {}
@ -411,7 +411,6 @@ def app_install(app, label=None, args=None):
except: except:
args_dict = {} args_dict = {}
# Execute App install script # Execute App install script
os.system('chown -hR admin: '+ install_tmp) os.system('chown -hR admin: '+ install_tmp)
# Move scripts and manifest to the right place # Move scripts and manifest to the right place
@ -689,7 +688,7 @@ def app_ssowatconf():
users = {} users = {}
for user in user_list()['Users']: for user in user_list()['Users']:
users[user['Username']] = app_map(user=user['Username']) users[user['Username']] = app_map(user=user['Username'])
skipped_uri=[] skipped_uri=[]
apps={} apps={}
for app in app_list()['Apps']: for app in app_list()['Apps']:
@ -701,7 +700,6 @@ def app_ssowatconf():
for domain in domains: for domain in domains:
skipped_uri.extend([domain +'/ynhadmin', domain +'/ynhapi']) skipped_uri.extend([domain +'/ynhadmin', domain +'/ynhapi'])
conf_dict = { conf_dict = {
'portal_domain': main_domain, 'portal_domain': main_domain,
'portal_path': '/ynhsso/', 'portal_path': '/ynhsso/',