← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/conf/conf.py

Convince the main XHTML template to use versioned styles/scripts, and move the
core styles and scripts to the new framework (in ivle.webapp.core).

www/media is dead!

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/conf/conf.py
32
32
import ivle.config
33
33
 
34
34
try:
35
 
    conf = ivle.config.Config(plugins=False)
 
35
    conf = ivle.config.Config()
36
36
except ivle.config.ConfigError, e:
37
37
    raise ImportError(str(e))
38
38
 
45
45
    'log_path': 'paths/logs',
46
46
    'python_site_packages_override': 'paths/site_packages',
47
47
    'public_host': 'urls/public_host',
 
48
    'allowed_uids': 'os/allowed_uids',
48
49
    'db_host': 'database/host',
49
50
    'db_port': 'database/port',
50
51
    'db_dbname': 'database/name',
 
52
    'db_forumdbname': 'plugins/forum/dbname',
51
53
    'db_user': 'database/username',
52
54
    'db_password': 'database/password',
53
55
    'auth_modules': 'auth/modules',
58
60
    'usrmgt_host': 'usrmgt/host',
59
61
    'usrmgt_port': 'usrmgt/port',
60
62
    'usrmgt_magic': 'usrmgt/magic',
 
63
    'forum_secret': 'plugins/forum/secret',
61
64
}
62
65
 
63
66
for legacyopt, newopt_path in CONFIG_OPTIONS.iteritems():
75
78
# pulldown_subj and auth_modules can re-split them.
76
79
subject_pulldown_modules = ','.join(subject_pulldown_modules)
77
80
auth_modules = ','.join(auth_modules)
 
81
allowed_uids = ','.join([str(uid) for uid in allowed_uids])
78
82
 
79
83
# Additional auto-generated config options
80
84