Changeset 353 for cleverbox

Timestamp:

12/04/08 17:39:42 (20 months ago)

Author:

trivoallan

Message:

Support for custom trac-admin location.

Location:

cleverbox/trunk

Files:

• assets/project.apache.conf (modified) (1 diff)
• cleverbox/model/environment.py (modified) (1 diff)
• cleverbox/model/project.py (modified) (5 diffs)
• cleverbox/scripts/admin.py (modified) (2 diffs)

cleverbox/trunk/assets/project.apache.conf

@@ -37 +37 @@
 
   SetHandler mod_python
-  PythonPath "['%(trac_install_dir)s'] + sys.path"
   PythonHandler trac.web.modpython_frontend
   PythonOption TracEnv %(clients_root)s/%(client_name)s/var/trac/%(project_name)s

cleverbox/trunk/cleverbox/model/environment.py

@@ -47 +47 @@
            parameters['general']['clients_root']
            parameters['general']['ssh_group']
+           parameters['trac']['tracadmin_path']
 
         except KeyError, e:

cleverbox/trunk/cleverbox/model/project.py

@@ -174 +174 @@
                                         'clients_root'     : environment.config.get('general', 'clients_root'),
                                         'authbackend_pass' : environment.config.get('general', 'authbackend_pass'),
-                                        'trac_install_dir' : environment.config.get('trac', 'lib_dir'),
                                         'domain_name'      : environment.config.get('general', 'domain')}
 
@@ -211 +210 @@
                  'db_dsn'           : 'sqlite:db/trac.db',
                  'svn_path'         : svn_path,
-                 'trac_install_dir' : environment.config.get('trac', 'lib_dir')}
-
-    trac_cmd = 'trac-admin %(env_path)s initenv "%(title)s" %(db_dsn)s svn %(svn_path)s' % cmd_data
+                 'tracadmin_path' : environment.config.get('trac', 'tracadmin_path')}
+
+    trac_cmd = '%(tracadmin_path)s %(env_path)s initenv "%(title)s" %(db_dsn)s svn %(svn_path)s' % cmd_data
     
     (stdin, stdout, stderr) = os.popen3( trac_cmd )
@@ -230 +229 @@
                                  infos['short_name'] )
 
-    trac_perms_cmd = 'trac-admin %(env_path)s permission %(subcommand)s %(subject)s %(perms)s'
+    trac_perms_cmd = '%(tracadmin_path)s %(env_path)s permission %(subcommand)s %(subject)s %(perms)s'
 
     # Grant default permissions
@@ -245 +244 @@
     admin_login = infos['tracadmin']
 
-    os.system( trac_perms_cmd % {'env_path'   : trac_env_path,
-                                 'subcommand' : 'add',
-                                 'subject'    : admin_login,
-                                 'perms'      : 'TRAC_ADMIN'} )
+    os.system( trac_perms_cmd % {'env_path'       : trac_env_path,
+                                 'subcommand'     : 'add',
+                                 'subject'        : admin_login,
+                                 'perms'          : 'TRAC_ADMIN',
+                                 'tracadmin_path' : environment.config.get('trac', 'tracadmin_path')} )
 
     print "  Trac initial permissions set (admin rights given to '%s')\n" % admin_login
@@ -321 +321 @@
                          'clients_root'     : environment.config.get('general', 'clients_root'),
                          'authbackend_pass' : environment.config.get('general', 'authbackend_pass'),
-                         'trac_install_dir' : environment.config.get('trac', 'lib_dir'),
                          'domain_name'      : environment.config.get('general', 'domain')}
     tracproject_config.add_section('cleverbox')

cleverbox/trunk/cleverbox/scripts/admin.py

@@ -138 +138 @@
         collected_infos['general']['apache_group'] = raw_input('Webserver group [%s]> ' % d_gid).strip() or d_gid
 
+        d_root_gid = 'www-data'
+        collected_infos['general']['root_group'] = raw_input('Root group [%s]> ' % d_root_gid).strip() or d_root_gid
+
         # root user & group
         # we keep the ssh_user notion for backward compatibility.
@@ -154 +157 @@
         collected_infos['general']['default_profile'] = raw_input('Default configuration profile [%s]> ' % dcp).strip() or dcp
 
-        d_lib_dir = '/usr/share/python-support/trac'
-        collected_infos['trac']['lib_dir'] = raw_input('Trac libs directory [%s]> ' % d_lib_dir).strip() or d_lib_dir
-
-        d_assets_dir = '/usr/share/trac'
-        collected_infos['trac']['assets_dir'] = raw_input('Trac assets directory [%s]> ' % d_assets_dir).strip() or d_assets_dir
-
-        d_root_gid = 'www-data'
-        collected_infos['general']['root_group'] = raw_input('Root group [%s]> ' % d_root_gid).strip() or d_root_gid
+        d_tracadmin_path = '/usr/bin/trac-admin'
+        collected_infos['trac']['tracadmin_path'] = raw_input('Path to trac-admin executable [%s]> ' % d_tracadmin_path).strip() or d_tracadmin_path
 
         # Environment creation