Context Navigation

← Previous Change
Next Change →

Changeset 352 for cleverbox/trunk

Timestamp:

11/17/08 16:09:17 (21 months ago)

Author:

trivoallan

Message:

Trac-0.11 compatibility \o/

Location:

cleverbox/trunk

Files:

: 4 modified

. (modified) (1 prop)
cleverbox/model/environment.py (modified) (2 diffs)
cleverbox/model/project.py (modified) (3 diffs)
debian/control (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

cleverbox/trunk

Property svn:ignore

old	new
2	2	.project
3	3	.pydevproject
	4	Cleverbox.egg-info

cleverbox/trunk/cleverbox/model/environment.py

r260	r352
46	46	parameters['general']['apache_group']
47	47	parameters['general']['clients_root']
48		parameters['general']['~~root~~_group']
	48	parameters['general']['ssh_group']
49	49
50	50	except KeyError, e:
…	…
107	107	# Set permissions
108	108	permissions = {self.get_path('VERSION') : (0640, 'root', self.config.get('general', 'apache_group')),
109		self.get_path('cleverbox.ini') : (0640, 'root', self.config.get('general', '~~root~~_group')),
	109	self.get_path('cleverbox.ini') : (0640, 'root', self.config.get('general', 'ssh_group')),
110	110	self.get_path('clients-available') : (0750, 'root', self.config.get('general', 'apache_group')),
111	111	self.get_path('clients-enabled') : (0750, 'root', self.config.get('general', 'apache_group')),
112	112	self.get_path('projects-available') : (0750, 'root', self.config.get('general', 'apache_group')),
113	113	self.get_path('projects-enabled') : (0750, 'root', self.config.get('general', 'apache_group')),
114		self.get_path('profiles') : (0750, 'root', self.config.get('general', '~~root~~_group')),
115		self.get_path('profiles/default') : (0750, 'root', self.config.get('general', '~~root~~_group')),
116		self.get_path('profiles/default/trac-defaults.ini') : (0640, 'root', self.config.get('general', '~~root~~_group')),
117		self.get_path('profiles/default/project.apache.conf') : (0640, 'root', self.config.get('general', '~~root~~_group')),
118		self.get_path('profiles/default/permissions.ini') : (0640, 'root', self.config.get('general', '~~root~~_group')),
	114	self.get_path('profiles') : (0750, 'root', self.config.get('general', 'ssh_group')),
	115	self.get_path('profiles/default') : (0750, 'root', self.config.get('general', 'ssh_group')),
	116	self.get_path('profiles/default/trac-defaults.ini') : (0640, 'root', self.config.get('general', 'ssh_group')),
	117	self.get_path('profiles/default/project.apache.conf') : (0640, 'root', self.config.get('general', 'ssh_group')),
	118	self.get_path('profiles/default/permissions.ini') : (0640, 'root', self.config.get('general', 'ssh_group')),
119	119	self.config.get('general', 'clients_root') : (0750, 'root', self.config.get('general', 'apache_group'))}
120	120

cleverbox/trunk/cleverbox/model/project.py

r338	r352
161	161
162	162	def _create_dirs(environment, infos):
163		os.makedirs(os.path.join(environment.config.get('general', 'clients_root'),
164		infos['client'],
165		'htdocs',
166		infos['short_name']), 0775)
167
168		print " Creating project's directory layout\n"
	163	os.makedirs(os.path.join(environment.config.get('general', 'clients_root'), infos['client'], 'htdocs', infos['short_name']), 0775)
	164
	165	print " Created project's directory layout\n"
169	166
170	167	def _write_apache_conf(environment, infos):
…	…
211	208
212	209	cmd_data = { 'env_path' : trac_env_path,
213		'title' : '~~"%s - %s - Trac"~~' % (infos['client'], infos['short_name']),
	210	'title' : '%s - %s - Trac' % (infos['client'], infos['short_name']),
214	211	'db_dsn' : 'sqlite:db/trac.db',
215	212	'svn_path' : svn_path,
216		~~'templates_path' : '%s/templates' % environment.config.get('trac', 'assets_dir'),~~
217	213	'trac_install_dir' : environment.config.get('trac', 'lib_dir')}
218	214
219		trac_cmd = 'trac-admin %(env_path)s initenv ~~%(title)s %(db_dsn)s svn %(svn_path)s %(templates~~_path)s' % cmd_data
220
	215	trac_cmd = 'trac-admin %(env_path)s initenv "%(title)s" %(db_dsn)s svn %(svn_path)s' % cmd_data
	216
221	217	(stdin, stdout, stderr) = os.popen3( trac_cmd )
222	218
…	…
284	280	os.path.join(clients_root, client_name, 'var', 'svn', project_name) : (0750, 'root', 'www-data'),
285	281	os.path.join(clients_root, client_name, 'var', 'svn', project_name, 'db') : (0770, 'root', 'www-data'),
286		os.path.join(clients_root, client_name, 'var', 'trac', project_name) : (0750, 'root', 'www-data'),
	282	os.path.join(clients_root, client_name, 'var', 'trac', project_name) : (0770, 'root', 'www-data'),
287	283	os.path.join(clients_root, client_name, 'var', 'trac', project_name, 'db') : (0770, 'root', 'www-data'),
288		os.path.join(clients_root, client_name, 'var', 'trac', project_name, 'db', 'trac.db') : (0640, 'root', 'www-data'),
	284	os.path.join(clients_root, client_name, 'var', 'trac', project_name, 'db', 'trac.db') : (0770, 'root', 'www-data'),
289	285	os.path.join(clients_root, client_name, 'var', 'trac', project_name, 'attachments') : (0770, 'root', 'www-data'),
290	286	os.path.join(clients_root, client_name, 'var', 'trac', project_name, 'conf', 'trac.ini') : (0640, 'root', 'www-data'),

cleverbox/trunk/debian/control

r351	r352
8	8	Package: cleverboxfuture
9	9	Architecture: all
10		Depends: ${python:Depends}, subversion (>=1.4.2), trac (>=0.11), libapache2-mod-python (>=3.2.10), libapache2-svn (>=1.4.2), python-setuptools (>=0.6c3-3)
	10	Depends: ${python:Depends}, subversion (>=1.4.2), trac (>=0.11), libapache2-mod-python (>=3.2.10), libapache2-svn (>=1.4.2), python-setuptools (>=0.6c3-3), python-subversion (>=1.5.1)
11	11	Suggests: libapache2-mod-macro
12	12	Conflicts: cleverbox

Download in other formats: