← Back to branch summary

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

« back to all changes in this revision

Viewing changes to bin/ivle-buildjail

./etc is no longer a special case in the ivle.conf search path.

ivle-config also now respects the same search path when writing a config.
It will write to ivle.conf in the directory mentioned in $IVLECONF, or
/etc/ivle if $IVLECONF is unset.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ivle-buildjail
43
43
    help='''Apply any package updates in the jail.''')
44
44
parser.add_option("-m", "--mirror",
45
45
    action="store", dest="apt_mirror",
46
 
    help="Sets the apt mirror.", default="http://archive.ubuntu.com/ubuntu")
 
46
    help="Sets the apt mirror used when recreating the jail.")
47
47
(options, args) = parser.parse_args(sys.argv)
48
48
 
49
49
if os.geteuid() != 0:
55
55
    sys.exit(1)
56
56
 
57
57
if options.recreate:
58
 
    options.upgrade = True
59
 
 
60
58
    # Create the jail and its subdirectories
61
59
    # Note: Other subdirs will be made by copying files
62
60
    if options.apt_mirror is not None:
66
64
    ivle.jailbuilder.debian.debootstrap_create_jail(conf['jail']['suite'],
67
65
              build_path, mirror=options.apt_mirror)
68
66
 
69
 
    ivle.jailbuilder.debian.apt_update_cache(build_path)
70
 
    ivle.jailbuilder.debian.apt_install(build_path,
71
 
                        ['python2.5', 'python-cjson', 'python-svn'])
72
 
 
73
 
    ivle.jailbuilder.debian.apt_clean(build_path)
74
 
 
75
 
if options.upgrade:
76
 
    # Run apt-get update, apt-get upgrade and apt-get clean.
77
 
    ivle.jailbuilder.debian.mangle_sources_list(build_path, clobber=True)
78
 
    ivle.jailbuilder.debian.mangle_sources_list(build_path, lines=[
79
 
            'deb %s %s%s %s' % (options.apt_mirror, conf['jail']['suite'],
80
 
                                pocket, ' '.join(['main', 'universe']))
81
 
            for pocket in ('', '-updates', '-security')])
82
 
 
83
67
    # Add any extra site apt sources.
84
68
    if conf['jail']['extra_sources']:
85
69
        ivle.jailbuilder.debian.mangle_sources_list(build_path,
91
75
                                            conf['jail']['extra_keys'])
92
76
 
93
77
    ivle.jailbuilder.debian.apt_update_cache(build_path)
94
 
    ivle.jailbuilder.debian.apt_upgrade(build_path)
 
78
    ivle.jailbuilder.debian.apt_install(build_path,
 
79
                        ['python2.5', 'python-cjson', 'python-svn'])
95
80
 
96
81
    # Install any extra site packages.
97
82
    if conf['jail']['extra_packages']:
100
85
 
101
86
    ivle.jailbuilder.debian.apt_clean(build_path)
102
87
 
103
 
if conf['jail']['devmode']:
104
 
    # Copy all console and operating system files into the jail
105
 
    services_path = os.path.join(ivle.conf.share_path, 'services')
106
 
    jail_services_path = os.path.join(build_path, services_path[1:])
107
 
    if os.path.exists(jail_services_path):
108
 
        shutil.rmtree(jail_services_path)
109
 
    shutil.copytree(services_path, jail_services_path)
110
 
 
111
 
    # Also copy the IVLE lib directory into the jail
112
 
    # This is necessary for running certain services
113
 
    ivle_site_packages = os.path.join(ivle.conf.python_site_packages, 'ivle')
114
 
    jail_site_packages = os.path.join(build_path, ivle_site_packages[1:])
115
 
    if os.path.exists(jail_site_packages):
116
 
        shutil.rmtree(jail_site_packages)
117
 
    shutil.copytree(ivle_site_packages, jail_site_packages)
118
 
 
119
 
    # IMPORTANT: ivle/conf/conf.py contains details which could compromise security
120
 
    # if left in the jail (such as the DB password). We delete it now! It would be
121
 
    # shadowed by the per-user conf.py anyway, but it's best to be safe.
122
 
    os.unlink(os.path.join(jail_site_packages, 'conf/conf.py'))
123
 
    # XXX: Shouldn't copy the compiled files at all, but compile them in the jail!
124
 
    os.unlink(os.path.join(jail_site_packages, 'conf/conf.pyc'))
 
88
if options.upgrade:
 
89
    # Run apt-get update, apt-get upgrade and apt-get clean.
 
90
    ivle.jailbuilder.debian.apt_update_cache(build_path)
 
91
    ivle.jailbuilder.debian.apt_upgrade(build_path)
 
92
    ivle.jailbuilder.debian.apt_clean(build_path)
 
93
 
 
94
# Copy all console and operating system files into the jail
 
95
services_path = os.path.join(ivle.conf.share_path, 'services')
 
96
jail_services_path = os.path.join(build_path, services_path[1:])
 
97
if os.path.exists(jail_services_path):
 
98
    shutil.rmtree(jail_services_path)
 
99
shutil.copytree(services_path, jail_services_path)
 
100
 
 
101
# Also copy the IVLE lib directory into the jail
 
102
# This is necessary for running certain services
 
103
ivle_site_packages = os.path.join(ivle.conf.python_site_packages, 'ivle')
 
104
jail_site_packages = os.path.join(build_path, ivle_site_packages[1:])
 
105
if os.path.exists(jail_site_packages):
 
106
    shutil.rmtree(jail_site_packages)
 
107
shutil.copytree(ivle_site_packages, jail_site_packages)
 
108
 
 
109
# IMPORTANT: ivle/conf/conf.py contains details which could compromise security
 
110
# if left in the jail (such as the DB password). We delete it now! It would be
 
111
# shadowed by the per-user conf.py anyway, but it's best to be safe.
 
112
os.unlink(os.path.join(jail_site_packages, 'conf/conf.py'))
 
113
# XXX: Shouldn't copy the compiled files at all, but compile them in the jail!
 
114
os.unlink(os.path.join(jail_site_packages, 'conf/conf.pyc'))
125
115
 
126
116
if os.spawnvp(os.P_WAIT, 'rsync', ['rsync', '-a', '--delete',
127
117
              build_path + '/', ivle.conf.jail_system]) != 0: