mirror of
https://github.com/YunoHost/moulinette.git
synced 2024-09-03 20:06:31 +02:00
Update yunohost_app.py
This commit is contained in:
parent
b333c5e5b4
commit
acb4094193
1 changed files with 2 additions and 4 deletions
|
@ -150,7 +150,7 @@ def app_list(offset=None, limit=None, filter=None, raw=False):
|
|||
continue
|
||||
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']['orphan']=True#{ 'orphan': True }
|
||||
app_dict[app]['manifest']['orphan']=True
|
||||
|
||||
if len(app_dict) > (0 + offset) and limit > 0:
|
||||
sorted_app_dict = {}
|
||||
|
@ -411,7 +411,6 @@ def app_install(app, label=None, args=None):
|
|||
except:
|
||||
args_dict = {}
|
||||
|
||||
|
||||
# Execute App install script
|
||||
os.system('chown -hR admin: '+ install_tmp)
|
||||
# Move scripts and manifest to the right place
|
||||
|
@ -689,7 +688,7 @@ def app_ssowatconf():
|
|||
users = {}
|
||||
for user in user_list()['Users']:
|
||||
users[user['Username']] = app_map(user=user['Username'])
|
||||
|
||||
|
||||
skipped_uri=[]
|
||||
apps={}
|
||||
for app in app_list()['Apps']:
|
||||
|
@ -701,7 +700,6 @@ def app_ssowatconf():
|
|||
for domain in domains:
|
||||
skipped_uri.extend([domain +'/ynhadmin', domain +'/ynhapi'])
|
||||
|
||||
|
||||
conf_dict = {
|
||||
'portal_domain': main_domain,
|
||||
'portal_path': '/ynhsso/',
|
||||
|
|
Loading…
Reference in a new issue