Changeset 177 for cleverbox/trunk

Timestamp:

08/13/07 17:26:50 (5 years ago)

Author:

trivoallan

Message:

cleverbox :

• Factored environment in it's own class.
• Made environment initialisation atomic
• Created stubs for unit tests
• Created stubs for color in cli output
• It's now possible to use *nix user and group names instead of uid and gid in cleverbox.ini

Work in progress, probably buggy.

Location:

cleverbox/trunk

Files:

• cleverbox/environment.py (added)
• cleverbox/scripts/admin.py (modified) (32 diffs)
• cleverbox/tests (added)
• cleverbox/tests/__init__.py (added)
• cleverbox/tests/client.py (added)
• cleverbox/tests/environment.py (added)
• cleverbox/tests/project.py (added)
• cleverbox/tests/upgrade.py (added)
• cleverbox/utils (added)
• cleverbox/utils/__init__.py (added)
• cleverbox/utils/termcolors.py (added)
• setup.py (modified) (1 diff)

cleverbox/trunk/cleverbox/scripts/admin.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 
-import shutil
-import cmd
-import os
-import shlex
-import sys
-import traceback
-import re
+import shutil, cmd, os, shlex, sys, traceback, re, ConfigParser, posix
+from pkg_resources import parse_version
 from trac import util
 from trac.scripts.admin import TracAdmin
-import ConfigParser
-from pkg_resources import parse_version
+from cleverbox.utils import termcolors
+from cleverbox.environment import Environment
 
 _defaults = {
@@ -22 +17 @@
 }
 
-_version = '0.5.dev'
+_version = '0.5dev'
+
+# Set up the terminal color scheme.
+class dummy: pass
+style = dummy()
+style.ERROR = termcolors.make_style(fg='red', opts=('bold',))
+del dummy
+
+def disable_termcolors():
+    class dummy:
+        def __getattr__(self, attr):
+            return lambda x: x
+    global style
+    style = dummy()
+
+# Disable terminal coloring on Windows, Pocket PC, or if somebody's piping the output.
+if sys.platform == 'win32' or sys.platform == 'Pocket PC' or not sys.stdout.isatty():
+    disable_termcolors()
 
 class CleverboxAdmin(cmd.Cmd):
@@ -31 +43 @@
     ruler = ''
     prompt = "Cleverbox > "
-    envname = None
-    __env = None
     _date_format = '%Y-%m-%d'
     _datetime_format = '%Y-%m-%d %H:%M:%S'
@@ -49 +59 @@
     ##
 
-    def env_set(self, envname, env=None):
-        self.envname = envname
-        self.prompt = "Cleverbox [%s] > " % self.envname
+    def env_set(self, env_path):
+        
+        # Load environment
+        self.env = Environment(env_path)
         
         # Check if environment needs an upgrade
-        #  - open VERSION
         try:
-            env_version = open(os.path.join(self.envname, 'VERSION')).read().strip()
-            
-            #  - compare with self._version
-            #  - if VERSION < self._version :
-            if parse_version(env_version) < parse_version(_version): 
+            if self.env.needs_upgrade(_version):
                 print "\nCleverbox environment needs to be upgraded. Please run :"
-                print "  cleverbox-admin %s upgrade\n" % self.envname
+                print "  cleverbox-admin %s upgrade\n" % self.env.path
                 sys.exit(1)
         except IOError, e:
             # no VERSION file means user wants to create an environment
             pass
+
+        # Set shell prompt
+        self.prompt = "Cleverbox [%s] > " % self.env.path
         
-        if env is not None:
-            self.__env = env
-
         # Read configuration
+        # TODO : move to environment.py ?
         self._config = ConfigParser.SafeConfigParser()
-        self._config.read(os.path.join(self.envname, 'cleverbox.ini'))
-
-
-    def env_check(self):
-        try:
-            pass
-            #self.__env = Environment(self.envname)
-        except:
-            return 0
-        return 1
-
-    def env_open(self):
-        try:
-            if not self.__env:
-                #self.__env = Environment(self.envname)
-                return self.__env
-        except Exception, e:
-            print 'Failed to open environment.', e
-            traceback.print_exc()
-            sys.exit(1)
+        self._config.read(self.env.get_file_path('cleverbox.ini'))
 
     def emptyline(self):
@@ -115 +103 @@
         self.cmdloop()
 
-    #
-    # Configuration related methods
-    #
-    def getConfig(self, directive, section):
-        try:
-            val = self._config.get(section, directive)
-        except ConfigParser.NoOptionError, exception:
-            val = ''
-        return val
-
-    #
-    # Commands
-    #
-
     ## Environment
     _help_initenv = [('initenv', 'Environment initialisation')]
     def do_initenv(self, line=None):
-        print "Environment initialisation in %(env_dir)s" % {'env_dir' : self.envname}
+        print "Environment initialisation in %(env_dir)s" % {'env_dir' : self.env.path}
 
         # Collect local configuration info
-        collected_infos = {}
+        collected_infos = {'general' : {}, 'trac' : {}}
 
         # Path to client dir
         default_root = '/var/cleverbox'
-        collected_infos['clients_root'] = raw_input('Projects directory [%s]> ' % default_root).strip() or default_root
+        collected_infos['general']['clients_root'] = raw_input('Projects directory [%s]> ' % default_root).strip() or default_root
 
         # Path to cleverbox assets
         default_assets_dir = '/usr/share/cleverbox'
-        collected_infos['assets_dir'] = raw_input('Cleverbox assets directory [%s]> ' % default_assets_dir).strip() or default_assets_dir
+        collected_infos['general']['assets_dir'] = raw_input('Cleverbox assets directory [%s]> ' % default_assets_dir).strip() or default_assets_dir
 
         try :
-            os.makedirs(collected_infos['clients_root'], 0775)
+            os.makedirs(collected_infos['general']['clients_root'], 0775)
         except IOError, ioexception :
             print ioexception
@@ -152 +126 @@
 
         # Apache user & group
-        d_uid = 33
-        d_gid = 33
-        collected_infos['apache_user'] = raw_input('Webserver user id [%d]> ' % d_uid).strip() or d_uid
-        collected_infos['apache_group'] = raw_input('Webserver group id [%d]> ' % d_gid).strip() or d_gid
+        d_uid = 'www-data'
+        d_gid = 'www-data'
+        collected_infos['general']['apache_user'] = raw_input('Webserver user [%s]> ' % d_uid).strip() or d_uid
+        collected_infos['general']['apache_group'] = raw_input('Webserver group [%s]> ' % d_gid).strip() or d_gid
 
         # root user & group
         # we keep the ssh_user notion for backward compatibility.
         # this will have to disappear in a future release 
-        collected_infos['ssh_user'] = 0
-        collected_infos['ssh_group'] = 0
+        collected_infos['general']['ssh_user'] = 'root'
+        collected_infos['general']['ssh_group'] = 'root'
 
         # Host server domain name
-        collected_infos['domain'] = raw_input('Domain name > ').strip()
+        collected_infos['general']['domain'] = raw_input('Domain name > ').strip()
         
         # Authentication backend password (if any)
-        collected_infos['authbackend_pass'] = raw_input('Authentication backend password (if any) []> ').strip() or ''
+        collected_infos['general']['authbackend_pass'] = raw_input('Authentication backend password (if any) []> ').strip() or ''
 
         # Default configuration profile
         dcp = 'default'
-        collected_infos['default_profile'] = raw_input('Default configuration profile [%s]> ' % dcp).strip() or dcp
+        collected_infos['general']['default_profile'] = raw_input('Default configuration profile [%s]> ' % dcp).strip() or dcp
                 
-        # Write ini file
-        self._config.add_section('general')
-        for directive, value in collected_infos.items() :
-            self._config.set('general', directive, str(value))
-
-        trac_infos = {}
         d_lib_dir = '/usr/share/python-support/trac'
-        trac_infos['lib_dir'] = raw_input('Trac libs directory [%s]> ' % d_lib_dir).strip() or d_lib_dir
+        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'
-        trac_infos['assets_dir'] = raw_input('Trac assets directory [%s]> ' % d_assets_dir).strip() or d_assets_dir
-
-        self._config.add_section('trac')
-        for directive, value in trac_infos.items() :
-            self._config.set('trac', directive, str(value))
+        collected_infos['trac']['assets_dir'] = raw_input('Trac assets directory [%s]> ' % d_assets_dir).strip() or d_assets_dir
+
+        # Environment creation
+        self.env.create(_version, collected_infos)
         
-        fh_config = open(os.path.join(self.envname, 'cleverbox.ini'), 'w+')
-        self._config.write(fh_config)
-
-        # Create directory structure
-        try:
-            print "\n\tCreating directory layout\n"
-            env_dirs = []
-            for dirname in _defaults['env_dir_layout']:
-                env_dirs.append( os.path.join(self.envname, dirname) )
-            map( os.makedirs, env_dirs )
-        except IOError, ioexception :
-            print ioexception
-            print "** Environment couldn't be initialized in %(env_dir)s\n" % {'env_dir' : self.envname}
-
-        # Create VERSION file
-        try:
-            print "\n\tCreating VERSION file\n"
-            fd = open( os.path.join(self.envname, 'VERSION'), 'w' )
-            fd.write(_version)
-        finally:
-            fd.close()
-
-        # Default configuration profile
-        print "\n\tCreating default configuration profile\n"
-        for filename in _defaults['profile_files']:
-            shutil.copy(collected_infos['assets_dir'] + '/' + filename, os.path.join(self.envname, 'profiles', 'default'))
-        
-
         print
         print "Environment successfully initialized\n"
         print "You need to add this statement to your apache configuration : \n" \
-            "\t'Include %(env_dir)s/clients-enabled/*'\n" % {'env_dir' : self.envname}
+            "\t'Include %(env_dir)s/clients-enabled/*'\n" % {'env_dir' : self.env.path}
 
     _help_upgrade = [('upgrade', 'Executes necessary operation to make environment up to date')]
     def do_upgrade(self, line=None):
-        env_version = open(os.path.join(self.envname, 'VERSION')).read()
-        if parse_version(env_version) < parse_version(_version): 
-            from cleverbox.upgrades import upgrades
-            i = 1
-            while i:
-                try:
-                    upgrade_func = getattr(upgrades, 'do_upgrade_' + str(i))
-                    upgrade_func.__call__(self.envname, env_version)
-                except AttributeError, e:
-                    break
-                i = i + 1
-            
+        self.env.upgrade()            
 
     ## help
@@ -334 +262 @@
                                 'ftp_password' : None }
 
-            collected_infos['home_dir'] = os.path.join(self.getConfig('clients_root', 'general'), client_name)
+            collected_infos['home_dir'] = os.path.join(self.env.config.get('general', 'clients_root'), client_name)
 
             # A few checks before effectively creating client
@@ -376 +304 @@
 """ % { 'client_name' : client_name,
         'home_dir'    : collected_infos['home_dir'],
-        'env_dir'     : self.envname }
+        'env_dir'     : self.env.path }
 
             # -- Write conf to filesystem
-            apache_conf_filepath = os.path.join( self.envname, 'clients-available', client_name )
+            apache_conf_filepath = os.path.join( self.env.path, 'clients-available', client_name )
             f = file(apache_conf_filepath, 'w+')
             f.write(apache_conf)
@@ -394 +322 @@
             chmod g+w /$CLIENTSROOT/$CLIENTNAME/uploads
             """
-            self._rchown( collected_infos['home_dir'],
-                         int(self.getConfig('ssh_user', 'general')),
-                         int(self.getConfig('ssh_group', 'general')) )
-            os.chown( os.path.join(collected_infos['home_dir'], 'logs'),
-                     int(self.getConfig('ssh_user', 'general')), int(self.getConfig('apache_group', 'general')) )
-            os.chmod( os.path.join(collected_infos['home_dir'], 'logs'), 0775 )
-            os.chown( os.path.join(collected_infos['home_dir'], 'uploads'),
-                     int(self.getConfig('ssh_user', 'general')), int(self.getConfig('apache_group', 'general')) )
-            os.chmod( os.path.join(collected_infos['home_dir'], 'uploads'), 0775 )
+            self._rchown(collected_infos['home_dir'],
+                         self.get_uid_from_name(username)(self.env.config.get('general', 'ssh_user')),
+                         self.get_gid_from_name(self.env.config.get('general', 'ssh_group')))
+            
+            os.chown(os.path.join(collected_infos['home_dir'], 'logs'),
+                     get_uid_from_name(self.env.config.get('general', 'ssh_user')), 
+                     get_gid_from_name(self.env.config.get('general', 'apache_group')) )
+            
+            os.chmod(os.path.join(collected_infos['home_dir'], 'logs'), 0775)
+            
+            os.chown(os.path.join(collected_infos['home_dir'], 'uploads'),
+                     get_uid_from_name(self.env.config.get('general', 'ssh_user')),
+                     get_gid_from_name(self.env.config.get('general', 'apache_group')))
+            
+            os.chmod(os.path.join(collected_infos['home_dir'], 'uploads'), 0775)
 
             print "  Fixed permissions in %s\n" % collected_infos['home_dir']
@@ -458 +392 @@
 
             # Disable client
-            client_apacheconf = os.path.join( self.envname, 'clients-available', client_name )
+            client_apacheconf = os.path.join( self.env.path, 'clients-available', client_name )
             os.unlink(client_apacheconf)
             print "Client '%s' has been removed." % client_name
@@ -476 +410 @@
 
         if enable_client:
-            target = os.path.join( self.envname, 'clients-available', client_name )
-            linkname = os.path.join( self.envname, 'clients-enabled', client_name )
+            target = os.path.join( self.env.path, 'clients-available', client_name )
+            linkname = os.path.join( self.env.path, 'clients-enabled', client_name )
             os.symlink( target, linkname )
             print "Client '%s' has been enabled" % client_name
@@ -499 +433 @@
 
         if disable_client:
-            linkname = os.path.join( self.envname, 'clients-enabled', client_name )
+            linkname = os.path.join( self.env.path, 'clients-enabled', client_name )
             os.unlink( linkname )
             print "Client '%s' has been disabled" % client_name
@@ -534 +468 @@
         # Each client
         if not only:
-            list_clients = os.listdir(os.path.join(self.envname, 'clients-available'))
+            list_clients = os.listdir(os.path.join(self.env.path, 'clients-available'))
 
         # Only enabled clients
         elif only == 'enabled':
-            list_clients = os.listdir(os.path.join(self.envname, 'clients-enabled'))
+            list_clients = os.listdir(os.path.join(self.env.path, 'clients-enabled'))
 
         # Only disabled clients (ie. not enabled)
@@ -544 +478 @@
 
             disabled_clients = []
-            available_clients = os.listdir(os.path.join(self.envname, 'clients-available'))
-            enabled_clients = os.listdir(os.path.join(self.envname, 'clients-enabled'))
+            available_clients = os.listdir(os.path.join(self.env.path, 'clients-available'))
+            enabled_clients = os.listdir(os.path.join(self.env.path, 'clients-enabled'))
 
             # Expect poor performances for this intersection algorithm
@@ -611 +545 @@
         all_projects_dir     = 'projects-available'
 
-        list_enabled_projects = os.listdir(os.path.join(self.envname, enabled_projects_dir))
-        list_all_projects = os.listdir(os.path.join(self.envname, all_projects_dir))
+        list_enabled_projects = os.listdir(os.path.join(self.env.path, enabled_projects_dir))
+        list_all_projects = os.listdir(os.path.join(self.env.path, all_projects_dir))
 
         list_projects = []
@@ -641 +575 @@
             if (self._project_exists(client_name, project_name)):
                 try:
-                    os.unlink( os.path.join(self.envname, 'projects-enabled', '%s-%s' % (client_name, project_name)) )
+                    os.unlink( os.path.join(self.env.path, 'projects-enabled', '%s-%s' % (client_name, project_name)) )
                     print "Project '%s' has been disabled. Apache needs to be reloaded." % project_name
                 except (IOError, os.error), exception:
@@ -657 +591 @@
             if self._project_exists(client_name, project_name):
                 try:
-                    target = os.path.join( self.envname,
+                    target = os.path.join( self.env.path,
                                           'projects-available',
                                           '%s-%s' % (client_name, project_name) )
-                    linkname = os.path.join( self.envname,
+                    linkname = os.path.join( self.env.path,
                                           'projects-enabled',
                                           '%s-%s' % (client_name, project_name) )
@@ -697 +631 @@
         # Delete apache config file
         try:
-            linkname = os.path.join( self.envname, 'projects-available', '%s-%s'% (client_name, project_name) )
+            linkname = os.path.join( self.env.path, 'projects-available', '%s-%s'% (client_name, project_name) )
             os.unlink( linkname )
             print "Project '%s' has been removed" % project_name
@@ -739 +673 @@
             print
             print "  What configuration profile should be used ?"
-            print "  Those reside in %s/profiles/" % self.envname
-            print
-
-            dp = self.getConfig('default_profile', 'general')
+            print "  Those reside in %s/profiles/" % self.env.path
+            print
+
+            dp = self.env.config.get('general', 'default_profile')
             collected_infos['profile'] = raw_input('Configuration profile [%s]> ' % dp).strip() or dp
 
@@ -790 +724 @@
 
     def _project_create_dirs(self, infos):
-        os.makedirs(os.path.join(self.getConfig('clients_root', 'general'),
+        os.makedirs(os.path.join(self.self.env.config.get('general', 'clients_root'),
                                  infos['client'],
                                  'htdocs',
@@ -801 +735 @@
         TODO : clients may not be stored in 'clients_root', be careful with that.
         """
-        conf_template = open(os.path.join(self.envname, 'profiles', infos['profile'], 'project.apache.conf'))
+        conf_template = open(os.path.join(self.env.path, 'profiles', infos['profile'], 'project.apache.conf'))
         conf_data = conf_template.read() % {'client_name'      : infos['client'],
                                             'project_name'     : infos['short_name'],
-                                            'clients_root'     : self.getConfig('clients_root', 'general'),
-                                            'authbackend_pass' : self.getConfig('authbackend_pass', 'general'),
-                                            'trac_install_dir' : self.getConfig('lib_dir', 'trac'),
-                                            'domain_name'      : self.getConfig('domain', 'general')}
-
-        apache_conf_filepath = os.path.join( self.envname, 'projects-available', '%s-%s' % (infos['client'], infos['short_name']) )
+                                            'clients_root'     : self.env.config.get('general', 'clients_root'),
+                                            'authbackend_pass' : self.env.config.get('general', 'authbackend_pass'),
+                                            'trac_install_dir' : self.env.config.get('trac', 'lib_dir'),
+                                            'domain_name'      : self.env.config.get('general', 'domain')}
+
+        apache_conf_filepath = os.path.join( self.env.path, 'projects-available', '%s-%s' % (infos['client'], infos['short_name']) )
         f = file(apache_conf_filepath, 'w+')
         f.write(conf_data)
@@ -817 +751 @@
 
     def _project_create_svn_repos(self, infos):
-        repos_path = os.path.join( self.getConfig('clients_root', 'general'), infos['client'], 'var/svn', infos['short_name'] )
+        repos_path = os.path.join( self.env.config.get('general', 'clients_root'), infos['client'], 'var/svn', infos['short_name'] )
         create_cmd = 'svnadmin create %s' % repos_path
         (stdin, stdout, stderr) = os.popen3( create_cmd )
@@ -829 +763 @@
     def _project_trac_initenv(self, infos):
 
-        trac_env_path = os.path.join( self.getConfig('clients_root', 'general'),
+        trac_env_path = os.path.join( self.env.config.get('general', 'clients_root'),
                                      infos['client'],
                                      'var/trac',
                                      infos['short_name'] )
 
-        svn_path = os.path.join( self.getConfig('clients_root', 'general'),
+        svn_path = os.path.join( self.env.config.get('general', 'clients_root'),
                                 infos['client'],
                                 'var/svn',
@@ -843 +777 @@
                      'db_dsn'           : 'sqlite:db/trac.db',
                      'svn_path'         : svn_path,
-                     'templates_path'   : '%s/templates' % self.getConfig('assets_dir', 'trac'),
-                     'trac_install_dir' : self.getConfig('lib_dir', 'trac')}
+                     'templates_path'   : '%s/templates' % self.env.config.get('trac', 'assets_dir'),
+                     'trac_install_dir' : self.env.config.get('trac', 'lib_dir')}
 
         trac_cmd = '/usr/bin/trac-admin %(env_path)s initenv %(title)s %(db_dsn)s svn %(svn_path)s %(templates_path)s' % cmd_data
@@ -858 +792 @@
 
     def _project_trac_setperms(self, infos):
-        trac_env_path = os.path.join( self.getConfig('clients_root', 'general'),
+        trac_env_path = os.path.join( self.env.config.get('general', 'clients_root'),
                                      infos['client'],
                                      'var/trac',
@@ -891 +825 @@
         # Grant default permissions
         perms_config = ConfigParser.SafeConfigParser()
-        perms_config.read(os.path.join(self.envname, 'profiles', infos['profile'], 'permissions.ini'))
+        perms_config.read(os.path.join(self.env.path, 'profiles', infos['profile'], 'permissions.ini'))
         for profile in perms_config.options('trac'):
             os.system( trac_perms_cmd % {'env_path'   : trac_env_path,
@@ -923 +857 @@
 
         # Trac DB
-        trac_db_path   = os.path.join( self.getConfig('clients_root', 'general'),
+        trac_db_path   = os.path.join(self.env.config.get('general', 'clients_root'),
                                       infos['client'],
                                       'var/trac',
                                       infos['short_name'],
-                                      'db' )
-        self._rchown( trac_db_path , int(self.getConfig('apache_user', 'general')), int(self.getConfig('ssh_group', 'general')) )
+                                      'db')
+        self._rchown(trac_db_path, 
+                     get_uid_from_name(self.env.config.get('general', 'apache_user')),
+                     get_gid_from_name(self.env.config.get('general', 'ssh_group')))
 
         # Trac attachments
-        trac_attachments_path = os.path.join( self.getConfig('clients_root', 'general'),
+        trac_attachments_path = os.path.join( self.env.config.get('general', 'clients_root'),
                                              infos['client'],
                                              'var/trac',
@@ -937 +873 @@
                                              'attachments' )
 
-        self._rchown( trac_attachments_path , int(self.getConfig('apache_user', 'general')), int(self.getConfig('ssh_group', 'general')) )
+        self._rchown(trac_attachments_path ,
+                     get_uid_from_name(self.env.config.get('general', 'apache_user')),
+                     get_gid_from_name(self.env.config.get('general', 'ssh_group')))
 
         # Trac conf
-        trac_ini_path   = os.path.join( self.getConfig('clients_root', 'general'),
+        trac_ini_path   = os.path.join( self.env.config.get('general', 'clients_root'),
                                        infos['client'],
                                        'var','trac',
@@ -948 +886 @@
 
         # Subversion repository
-        svn_repos_path = os.path.join( self.getConfig('clients_root', 'general'),
+        svn_repos_path = os.path.join( self.env.config.get('general', 'clients_root'),
                                       infos['client'],
                                       'var/svn',
                                       infos['short_name'] )
 
-        self._rchown( svn_repos_path, int(self.getConfig('apache_user', 'general')), int(self.getConfig('ssh_group', 'general')) )
+        self._rchown(svn_repos_path, 
+                     get_uid_from_name(self.env.config.get('general', 'apache_user')), 
+                     get_gid_from_name(self.env.config.get('general', 'ssh_group')))
+        
         os.chmod( svn_repos_path, 0775 )
 
@@ -965 +906 @@
         # New defaults
         tracdefaults_config = ConfigParser.SafeConfigParser()
-        tracdefaults_config.read(os.path.join(self.envname, 'profiles', infos['profile'], 'trac-defaults.ini'))
+        tracdefaults_config.read(os.path.join(self.env.path, 'profiles', infos['profile'], 'trac-defaults.ini'))
         
         # Trac base config file
-        project_config_path = os.path.join(self.getConfig('clients_root', 'general', infos['client'], 'var', 'trac', infos['short_name'], 'conf', 'trac.ini'))
+        project_config_path = os.path.join(self.env.config.get('general', 'clients_root', infos['client'], 'var', 'trac', infos['short_name'], 'conf', 'trac.ini'))
         tracproject_config = ConfigParser.SafeConfigParser()
         tracproject_config.read(project_config_path)
@@ -981 +922 @@
                 default_option = tracdefaults_config.get(section, option) % {'client_name'      : infos['client'],
                                                                              'project_name'     : infos['short_name'],
-                                                                             'clients_root'     : self.getConfig('clients_root', 'general'),
-                                                                             'authbackend_pass' : self.getConfig('authbackend_pass', 'general'),
-                                                                             'trac_install_dir' : self.getConfig('lib_dir', 'trac'),
-                                                                             'domain_name'      : self.getConfig('domain', 'general')}
+                                                                             'clients_root'     : self.env.config.get('general', 'clients_root'),
+                                                                             'authbackend_pass' : self.env.config.get('general', 'authbackend_pass'),
+                                                                             'trac_install_dir' : self.env.config.get('trac', 'lib_dir'),
+                                                                             'domain_name'      : self.env.config.get('general', 'domain')}
                 tracproject_config.set(section, option, default_option)
 
@@ -1095 +1036 @@
         argstr = util.to_utf8(argstr, sys.stdin.encoding)
         return shlex.split(argstr) or ['']
+
+    def get_uid_from_name(self, username):
+        return posix.pwd.getpwnam(username)['pw_uid']
+        
+    def get_gid_from_name(self, groupname):
+        return posix.grp.getgrnam(groupname)['gr_gid']
 
 def run(args):

cleverbox/trunk/setup.py

@@ -34 +34 @@
     # Project identity
     name='Cleverbox',
-    version='0.5.dev',
+    version='0.5dev',
     description='Script for automating multiple trac instances deployment and maintenance.',
     author='Tristan Rivoallan',