Changeset 219 for cleverbox/trunk/cleverbox/scripts/admin.py

Timestamp:

02/06/08 14:09:34 (4 years ago)

Author:

gperier

Message:

cleverbox :

• Add Root Group definition to initenv method

Files:

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

cleverbox/trunk/cleverbox/scripts/admin.py

@@ -27 +27 @@
             self.env_set(os.path.abspath(envdir))
         self.interactive = False
-        
+
         # Setup logging
         screen = logging.StreamHandler(sys.stdout)
@@ -39 +39 @@
 
     def env_set(self, env_path, check_upgrade=True):
-        
+
         # Load environment
         self.env = Environment(env_path)
@@ -94 +94 @@
         logging.info("Environment initialisation in %(env_dir)s" % {'env_dir' : self.env.path})
 
-        # Collect local configuration info
+        #Collect local configuration info
         collected_infos = {'general' : {}, 'trac' : {}}
 
@@ -113 +113 @@
         # root user & group
         # we keep the ssh_user notion for backward compatibility.
-        # this will have to disappear in a future release 
+        # this will have to disappear in a future release
         collected_infos['general']['ssh_user'] = 'root'
         collected_infos['general']['ssh_group'] = 'root'
@@ -119 +119 @@
         # Host server domain name
         collected_infos['general']['domain'] = raw_input('Domain name > ').strip()
-        
+
         # Authentication backend password (if any)
         collected_infos['general']['authbackend_pass'] = raw_input('Authentication backend password (if any) []> ').strip() or ''
@@ -126 +126 @@
         dcp = 'default'
         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
@@ -133 +133 @@
         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
+
         # Environment creation
         self.env.create(cleverbox.version, collected_infos)
-        
+
         print
         print termcolors.colorize('', fg='green', opts=('noreset',))
@@ -145 +148 @@
     _help_upgrade = [('upgrade', 'Executes necessary operation to make environment up to date')]
     def do_upgrade(self, line=None):
-        self.env.upgrade()            
+        self.env.upgrade()
 
     ## help
@@ -214 +217 @@
         Displays enabled and disabled clients.
         '''
-        
+
         all_clients = client.get(self.env)
         if len(all_clients):
@@ -220 +223 @@
             all_clients.sort()
             en_clients = client.get(self.env, 'enabled')
-            dis_clients = client.get(self.env, 'disabled') 
+            dis_clients = client.get(self.env, 'disabled')
             for client_name in all_clients:
                 if client_name in en_clients:
@@ -270 +273 @@
         clients = client.get(self.env)
         clients.sort()
-        
+
         for client_name in clients:
-            
+
             all_projects = project.get(self.env, client_name)
             if not len(all_projects): continue
-            
+
             all_projects.sort()
-                        
+
             print styles.style.H1("\n%s :" % client_name)
-            
+
             enabled_projects = project.get(self.env, client_name, 'enabled')
             disabled_projects = project.get(self.env, client_name, 'disabled')
 
-            
+
             for project_name in all_projects:
                 if project_name in enabled_projects:
@@ -291 +294 @@
 
     def _do_project_disable(self, args):
-        
+
         # Check syntax
         if not len(args) == 2:
             self.do_help('project')
             raise Exception, 'Invalid syntax'
-        
+
         # Disable project
         (client_name, project_name) = args
@@ -306 +309 @@
             self.do_help('project')
             raise Exception, 'Invalid syntax'
-            
+
         (client_name, project_name) = args
         project.enable(self.env, client_name, project_name)
@@ -317 +320 @@
         # Extract parameters from command parameters
         (client_name, project_name) = args
-        
+
         # Create input specification
         input_spec = {'full_name' : ('Full name', 'This variable is not used anywhere !', project_name.capitalize()),
@@ -323 +326 @@
                       'enable'    : ('Enable project ?', 'This will make project available on the web.', 'n'),
                       'tracadmin' : ('Trac administrator', "This user will be granted full privileges on project's Trac instance", project_name + '-admin')}
-        
+
         # Collect input
         collected_input = inputcollector.collect(input_spec)
-        
+
         # Create project
         project.add(self.env, client_name, project_name, collected_input)