Changeset 143 for cleverbox/trunk/cleverbox

Timestamp:

08/10/07 13:54:50 (5 years ago)

Author:

trivoallan

Message:

cleverbox :

• Rewrote documentation for new "configuration profiles". Tried to make it a bit clearer
• [BC BREAK] Implemented "Rework apache templates handling"
• Fixed Subversion hooks handling :  http://trac-hacks.org/wiki/TracSvnHooksPlugin is enabled by default
• Removed "ssh_user" concept

fixes #2, #10

Files:

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

cleverbox/trunk/cleverbox/scripts/admin.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 
+import shutils
 import cmd
 import os
@@ -12 +13 @@
 
 _defaults = {
-    'env_dir_layout'       : ('clients-available', 'clients-enabled',
-                              'projects-available', 'projects-enabled'),
+    'env_dir_layout'    : ('clients-available', 'clients-enabled',
+                           'projects-available', 'projects-enabled',
+                           'profiles/default'),
     'client_dir_layout' : ('htdocs', 'logs', 'tmp', 'uploads',
                            'var/svn', 'var/trac'),
+    'profile_files'     : ('project.apache.conf', 'trac-defaults.ini', 'permissions.ini')
 }
 
@@ -133 +136 @@
         collected_infos['apache_group'] = raw_input('Webserver group id [%d]> ' % d_gid).strip() or d_gid
 
-        # SSH user & group
-        d_uid = '1001'
-        d_gid = '1001'
-        collected_infos['ssh_user'] = raw_input('SSH user id [%s]> ' % d_uid).strip() or d_uid
-        collected_infos['ssh_group'] = raw_input('SSH group id [%s]> ' % d_gid).strip() or d_gid
-
-        # Virtual Host mode : single or multi ?
-        d_vhost_mode = 'single'
-        collected_infos['vhost_mode'] = raw_input('Virtual host mode (either "single" or "multi") [%s]> ' % d_vhost_mode).strip() or d_vhost_mode
+        # 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
+
+        # Host server domain name
+        collected_infos['domain'] = raw_input('Domain name > ').strip()
         
-        if collected_infos['vhost_mode'] == 'multi':
-            collected_infos['domain'] = raw_input('Domain name > ').strip()
-        
-        # Cleverbox assets
-        d_cleverbox_assets = '/usr/share/cleverbox'
-        collected_infos['assets_dir'] = raw_input('Cleverbox assets directory [%s]> ' % d_cleverbox_assets).strip() or d_cleverbox_assets
-
         # Authentication backend password (if any)
         collected_infos['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
                 
         # Write ini file
@@ -174 +173 @@
         # Create directory structure
         try:
-            print "\n\tCreating directory structure\n"
+            print "\n\tCreating directory layout\n"
             env_dirs = []
             for dirname in _defaults['env_dir_layout']:
@@ -185 +184 @@
         # 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']:
+            shutils.copy('/usr/share/cleverbox/assets/' + filename, os.path.join(self.envname, 'profile', 'default'))
+        
 
         print
@@ -695 +701 @@
             collected_infos['full_name'] = raw_input('Full Name [%s]> ' % dfn).strip() or dfn
 
+            print
+            print "  What configuration profile should be used ?"
+            print "  Those reside in %s/profiles/" % self.envname
+            print
+
+            dp = self.getConfig('default_profile', 'general')
+            collected_infos['profile'] = raw_input('Configuration profile [%s]> ' % dp).strip() or dp
+
             # Project creation
             print
@@ -751 +765 @@
         TODO : clients may not be stored in 'clients_root', be careful with that.
         """
-        conf_template = open('%s/%s.%s' % (self.getConfig('assets_dir', 'general'), 'apache.conf', self.getConfig('vhost_mode', 'general')))
+        conf_template = open(os.path.join(self.envname, 'profiles', infos['profile'], 'project.apache.conf'))
         conf_data = conf_template.read() % {'client_name'      : infos['client'],
                                             'project_name'     : infos['short_name'],
@@ -841 +855 @@
         # Grant default permissions
         perms_config = ConfigParser.SafeConfigParser()
-        perms_config.read(os.path.join(self.getConfig('assets_dir', 'general'), 'permissions.ini'))
+        perms_config.read(os.path.join(self.envname, 'profiles', infos['profile'], 'permissions.ini'))
         for profile in perms_config.options('trac'):
             os.system( trac_perms_cmd % {'env_path'   : trac_env_path,
@@ -868 +882 @@
         chmod g+w /$CLIENTSROOT/$CLIENTNAME/var/svn/$PROJECTNAME
         chown -R www-data:dev /$CLIENTSROOT/$CLIENTNAME/var/trac/$PROJECTNAME/db
-        chown dev:www-data /$CLIENTSROOT/$CLIENTNAME/var/trac/conf/trac.ini
-        chmod g+w /$CLIENTSROOT/$CLIENTNAME/var/trac/conf/trac.ini
+            chown dev:www-data /$CLIENTSROOT/$CLIENTNAME/var/trac/conf/trac.ini
+            chmod g+w /$CLIENTSROOT/$CLIENTNAME/var/trac/conf/trac.ini
         """
 
@@ -909 +923 @@
 
     def _project_trac_defaultconf(self, infos):
+        """
+        Overrides project's default trac.ini with values provided in configuration profile.
+        """
+        
         # New defaults
         tracdefaults_config = ConfigParser.SafeConfigParser()
-        tracdefaults_config.read(os.path.join(self.getConfig('assets_dir', 'general'), 'trac-defaults.ini'))
+        tracdefaults_config.read(os.path.join(self.envname, 'profiles', infos['profile'], 'trac-defaults.ini'))
         
         # Trac base config file
-        project_config_path = os.path.join('%s/%s/var/trac/%s/conf/trac.ini' % (self.getConfig('clients_root', 'general'), infos['client'], infos['short_name']))
+        project_config_path = os.path.join(self.getConfig('clients_root', 'general', infos['client'], 'var', 'trac', infos['short_name'], 'conf', 'trac.ini'))
         tracproject_config = ConfigParser.SafeConfigParser()
         tracproject_config.read(project_config_path)