← 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:50:50 UTC
  • Revision ID: matt.giuca@gmail.com-20090428105050-ijvi1i9o6wmkr3ds
ivle.makeuser: make_jail now requires a config argument.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/makeuser.py
181
181
    return (to_add, to_remove)
182
182
 
183
183
 
184
 
def make_jail(user, force=True):
 
184
def make_jail(user, config, force=True):
185
185
    """Creates a new user's jail space, in the jail directory as configured in
186
186
    conf.py.
187
187
 
200
200
        raise Exception("Must run make_jail as root")
201
201
    
202
202
    # tempdir is for putting backup homes in
203
 
    tempdir = os.path.join(ivle.conf.jail_src_base, '__temp__')
 
203
    jail_src_base = config['paths']['jails']['src']
 
204
    tempdir = os.path.join(jail_src_base, '__temp__')
204
205
    if not os.path.exists(tempdir):
205
206
        os.makedirs(tempdir)
206
207
    elif not os.path.isdir(tempdir):
207
208
        os.unlink(tempdir)
208
209
        os.mkdir(tempdir)
209
 
    userdir = os.path.join(ivle.conf.jail_src_base, user.login)
 
210
    userdir = os.path.join(jail_src_base, user.login)
210
211
    homedir = os.path.join(userdir, 'home')
211
212
    userhomedir = os.path.join(homedir, user.login)   # Return value
212
213
 
244
245
        os.chmod(userhomedir, 0755)
245
246
 
246
247
    make_ivle_conf(user.login, userdir, user.svn_pass)
247
 
    make_etc_passwd(user.login, userdir, ivle.conf.jail_system, user.unixid)
 
248
    make_etc_passwd(user.login, userdir, config['paths']['jails']['template'],
 
249
                    user.unixid)
248
250
 
249
251
    return userhomedir
250
252