mirror of
https://github.com/YunoHost/moulinette.git
synced 2024-09-03 20:06:31 +02:00
skipped url bugfix in ssowat conf
This commit is contained in:
parent
fe3936e42b
commit
56ee75f256
1 changed files with 8 additions and 27 deletions
|
@ -642,24 +642,6 @@ def app_ssowatconf():
|
||||||
|
|
||||||
domains = domain_list()['Domains']
|
domains = domain_list()['Domains']
|
||||||
|
|
||||||
apps = {}
|
|
||||||
for app in os.listdir(apps_setting_path):
|
|
||||||
app_settings = app_info(raw=True, app=app)['settings']
|
|
||||||
if 'domain' in app_settings:
|
|
||||||
if 'path' not in app_settings:
|
|
||||||
app_settings['path'] = '/'
|
|
||||||
if 'mode' not in app_settings:
|
|
||||||
app_settings['mode'] = 'private'
|
|
||||||
if 'allowed_users' not in app_settings:
|
|
||||||
app_settings['allowed_users'] = ''
|
|
||||||
|
|
||||||
apps[app] = {
|
|
||||||
'domain': app_settings['domain'],
|
|
||||||
'path': app_settings['path'],
|
|
||||||
'mode': app_settings['mode'],
|
|
||||||
'allowed_users': app_settings['allowed_users']
|
|
||||||
}
|
|
||||||
|
|
||||||
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'])
|
||||||
|
@ -676,9 +658,8 @@ def app_ssowatconf():
|
||||||
'Email': 'mail'
|
'Email': 'mail'
|
||||||
},
|
},
|
||||||
'domains': domains,
|
'domains': domains,
|
||||||
'skipped_urls': ['https://'+ main_domain +'/ynhadmin'],
|
'skipped_urls': [main_domain +'/ynhadmin'],
|
||||||
'unprotected_urls': [],
|
'unprotected_urls': [],
|
||||||
'apps': apps,
|
|
||||||
'users': users
|
'users': users
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue