← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/makeuser.py

  • Committer: Matt Giuca
  • Date: 2009-04-28 10:57:28 UTC
  • Revision ID: matt.giuca@gmail.com-20090428105728-5zukncq7ycw7ga6h
ivle.makeuser: make_ivle_conf now requires a config argument.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/makeuser.py
244
244
        # Chmod to rwxr-xr-x (755)
245
245
        os.chmod(userhomedir, 0755)
246
246
 
247
 
    make_ivle_conf(user.login, userdir, user.svn_pass)
 
247
    make_ivle_conf(user.login, userdir, user.svn_pass, config)
248
248
    make_etc_passwd(user.login, userdir, config['paths']['jails']['template'],
249
249
                    user.unixid)
250
250
 
251
251
    return userhomedir
252
252
 
253
 
def make_ivle_conf(username, user_jail_dir, svn_pass):
 
253
def make_ivle_conf(username, user_jail_dir, svn_pass, sys_config):
254
254
    """
255
255
    Creates (overwriting any existing file, and creating directories) a
256
256
    file /etc/ivle/ivle.conf in a given user's jail.
257
 
    username: Username.
258
 
    user_jail_dir: User's jail dir, ie. ivle.conf.jail_base + username
259
 
    svn_pass: User's SVN password.
 
257
    @param username: Username.
 
258
    @param user_jail_dir: User's jail dir, ie. ivle.conf.jail_base + username
 
259
    @param svn_pass: User's SVN password.
 
260
    @param sys_config: An ivle.config.Config object (the system-wide config).
260
261
    """
261
262
    conf_path = os.path.join(user_jail_dir, "etc/ivle/ivle.conf")
262
263
    os.makedirs(os.path.dirname(conf_path))
266
267
    # So we just write root_dir.
267
268
    conf_obj = ivle.config.Config(blank=True)
268
269
    conf_obj.filename = conf_path
269
 
    conf_obj['urls']['root'] = ivle.conf.root_dir
270
 
    conf_obj['urls']['public_host'] = ivle.conf.public_host
271
 
    conf_obj['urls']['svn_addr'] = ivle.conf.svn_addr
 
270
    conf_obj['urls']['root'] = sys_config['urls']['root']
 
271
    conf_obj['urls']['public_host'] = sys_config['urls']['public_host']
 
272
    conf_obj['urls']['svn_addr'] = sys_config['urls']['svn_addr']
272
273
    conf_obj['user_info']['login'] = username
273
274
    conf_obj['user_info']['svn_pass'] = svn_pass
274
275
    conf_obj.write()