Changeset 147 for cleverbox/trunk/cleverbox

Timestamp:

08/10/07 15:33:42 (5 years ago)

Author:

trivoallan

Message:

cleverbox :

• implemented trac.ini-defaults variable substitution

fixes #1

Files:

• cleverbox/trunk/cleverbox/scripts/admin.py (modified) (3 diffs)

cleverbox/trunk/cleverbox/scripts/admin.py

@@ -903 +903 @@
         self._rchown( trac_attachments_path , int(self.getConfig('apache_user', 'general')), int(self.getConfig('ssh_group', 'general')) )
 
-        # Trac conf
+        # Trac conf
         trac_ini_path   = os.path.join( self.getConfig('clients_root', 'general'),
                                        infos['client'],
@@ -909 +909 @@
                                        infos['short_name'],
                                        'conf','trac.ini' )
-        os.chmod( trac_ini_path, 0777 ) 
+        os.chmod( trac_ini_path, 0777 ) 
 
         # Subversion repository
@@ -941 +941 @@
                 tracproject_config.add_section(section)
             for option in tracdefaults_config.options(section):
-                tracproject_config.set(section, option, tracdefaults_config.get(section, option))
+                # Perform variable substituion in each default option
+                # It is probably not very good in term of performances, but we'll wait until someone complains to fix it
+                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')}
+                tracproject_config.set(section, option, default_option)
 
         fp = open(project_config_path, 'w+')