Merge lp:~mcfletch/modwsgideploy/parameterized into lp:~szybalski/modwsgideploy/trunk

[Mike C. Fletcher]

Hi Lucas,

I've made a few changes and enhancements to the modwsgi_deploy script:

* parameterized almost all paths, names and the like
* updated for use with any Python 2.x interpreter
* tried to compress the code using conditionals
* numerous typo fixes
* cleaned out some copy-and-paste code that wasn't getting used
* generate warnings if referenced paths don't exist with instructions on how to fix
* reformatted the .wsgi file to look more like a Python module

I haven't finished testing, just wanted to give you a heads-up so you could look over the changes and see whether you're interested in integrating them.

Enjoy,
Mike

Unmerged revisions

21. By Mike C. Fletcher on 2010-03-05

Testing of default operation on Apache shows we're getting close.
python-eggs test/warning on configuration

20. By Mike C. Fletcher on 2010-03-05

Even more parameterization.
Log warnings to the user about not-yet-finished operations in the setup.
Fix missing application virtualenv option.
Make the apache template slightly more compact.
Rewrite readme as (loosely) .rst format.

19. By Mike C. Fletcher on 2010-03-05

Yet more parameterization.
Clean up the generated .wsgi file to look a little more like a Python file, with a docstring, wrapped lines, only the configured pieces, etceteras

18. By Mike C. Fletcher on 2010-03-04

Cleanup usage string to eliminate old copy-and-pasted descriptions that no longer apply.
Make deployment and baseline directories command-line configurable
Make logging setup configurable from the command line.
Use the current Python version as the default for the lib/.../ links, allow command-line override.

17. By Mike C. Fletcher on 2010-03-04

Minor typo fix

=== modified file 'trunk/README.txt'
--- trunk/README.txt	2009-09-27 03:29:25 +0000
+++ trunk/README.txt	2010-03-08 17:56:30 +0000
@@ -34,7 +34,7 @@
  cd modwsgideploy_code/trunk
  python setup.py develop
 
-Run modwsgi_deploy 
+Run modwsgi_deploy
 ------------------
 
 Go into your python application project folder and type in::
@@ -45,7 +45,7 @@
 Example
 -------
 
-Here is a typical installation, from start to finish on Debian Linux. You might have to use you OS specific commands for installing apache. 
+Here is a typical installation, from start to finish on Debian Linux. You might have to use you OS specific commands for installing apache.
 
 The steps are:
 1) Install apache and modwsgi
@@ -62,7 +62,7 @@
  source BASELINE/bin/activate
  easy_install -i http://www.turbogears.org/2.0/downloads/current/index tg.devtools
  paster quickstart myapp
- 
+
 Install modwsgideploy::
 
  easy_install modwsgideploy
@@ -80,14 +80,14 @@
  |   |-- myapp
  |   |-- myapp.wsgi
  |   `-- test.wsgi
- 
+
 
 1. Read the README.txt
 2. myapp is a apache configuration file that you need to copy into your apache configuration folder after all the settings are set.
 3. myapp.wsgi is an modwsgi script that is called from myapp apache file
 4. test.wsgi is a test script that you can call to see if you modwsgi was properly installed and working.
 
-Edit myapp file to change any paths and/or apache configurations. Then copy to apache folder. 
+Edit myapp file to change any paths and/or apache configurations. Then copy to apache folder.
 
 On my operating system I copy this file to::
 
@@ -103,5 +103,5 @@
 Feedback
 --------
 
-If you have a useful sample wsgi script or apache config that you would like to share, please sent it to Turbogears mailing list.   
+If you have a useful sample wsgi script or apache config that you would like to share, please send it to Turbogears mailing list.
 
 
=== modified file 'trunk/modwsgideploy.egg-info/PKG-INFO'
--- trunk/modwsgideploy.egg-info/PKG-INFO	2009-09-27 03:58:24 +0000
+++ trunk/modwsgideploy.egg-info/PKG-INFO	2010-03-08 17:56:30 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: modwsgideploy
-Version: 0.4.18dev
+Version: 0.4.20dev
 Summary: Deploy Turbogears2 or Pylons via apache and modwsgi.
 Home-page: http://lucasmanual.com/mywiki/modwsgideploy
 Author: Lukasz Szybalski
 
=== modified file 'trunk/modwsgideploy.egg-info/entry_points.txt'
--- trunk/modwsgideploy.egg-info/entry_points.txt	2009-04-10 20:17:26 +0000
+++ trunk/modwsgideploy.egg-info/entry_points.txt	2010-03-08 17:56:30 +0000
@@ -1,4 +1,4 @@
 
         [paste.global_paster_command]
         modwsgi_deploy = modwsgideploy.commands:ModwsgiCommand
-      
 \ No newline at end of file
+    
 \ No newline at end of file
 
=== modified file 'trunk/modwsgideploy/commands.py'
--- trunk/modwsgideploy/commands.py	2008-12-16 04:47:54 +0000
+++ trunk/modwsgideploy/commands.py	2010-03-08 17:56:30 +0000
@@ -7,48 +7,16 @@
 
     modwsgi_deploy
 """
-
 import os
 import sys
-
+import logging, pprint
+log = logging.getLogger( 'modwsgideploy' )
 from paste.script.command import Command, BadCommand
 from paste.script.filemaker import FileOp
 from paste.script.copydir import copy_dir
-
-
 #Needed to manipulate egg information
 from paste.script import pluginlib
 
-def can_import(name):
-    """Attempt to __import__ the specified package/module, returning True when
-    succeeding, otherwise False"""
-    try:
-        __import__(name)
-        return True
-    except ImportError:
-        return False
-
-def validateName(name):
-    """Validate that the name for the layer isn't present on the
-    path already"""
-    if not name:
-        # This happens when the name is an existing directory
-        raise BadCommand('Please give the name of a layer.')
-    # 'setup' is a valid controller name, but when paster controller is ran
-    # from the root directory of a project, importing setup will import the
-    # project's setup.py causing a sys.exit(). Blame relative imports
-    if name != 'setup' and can_import(name):
-        raise BadCommand(
-            "\n\nA module named '%s' is already present in your "
-            "PYTHON_PATH.\nChoosing a conflicting name will likely cause "
-            "import problems in\nyour controller at some point. It's "
-            "suggested that you choose an\nalternate name, and if you'd "
-            "like that name to be accessible as\n'%s', add a route "
-            "to your projects config/routing.py file similar\nto:\n"
-            "    map.connect('%s', controller='my_%s')" \
-            % (name, name, name, name))
-    return True
-
 class ModwsgiCommand(Command):
     """Create a modwsgi apache configuration.
 
@@ -57,17 +25,10 @@
     Example usage::
 
         yourproj% paster modwsgi_deploy
-        Creating yourproj/yourproj/controllers/foos.py
-        Creating yourproj/yourproj/tests/functional/test_foos.py
-
-    If you'd like to have controllers underneath a directory, just include
-    the path as the controller name and the necessary directories will be
-    created for you::
-
-        yourproj% paster geo-controller admin/foos
-        Creating yourproj/controllers/admin
-        Creating yourproj/yourproj/controllers/admin/foos.py
-        Creating yourproj/yourproj/tests/functional/test_admin_foos.py
+
+    Or, with logging enabled:
+
+        yourproj% paster modwsgi_deploy --logging
     """
     summary = __doc__.splitlines()[0]
     usage = '\n' + __doc__
@@ -79,17 +40,58 @@
     default_verbosity = 3
 
     parser = Command.standard_parser(simulate=True)
-    parser.add_option('--no-test',
-                      action='store_true',
-                      dest='no_test',
-                      help="Don't create the test; just the controller")
     parser.add_option('-o', '--output-dir',
                       dest='output_dir',
                       metavar='DIR',
                       default='.',
-                      help="Write put the directory into DIR (default current directory)")
+                      help="Write Apache2 configuration files in DIR/apache (default current directory)")
+    parser.add_option('-b', '--baseline',
+                      dest='baseline',
+                      metavar='DIR',
+                      default='/usr/local/pythonenv/BASELINE',
+                      help="Path to the BASELINE VirtualEnv shared by applications, if set to '', then no BASELINE VirtualEnv is configured")
+    parser.add_option('-e', '--virtualenv',
+                      dest='virtualenv',
+                      action='store',
+                      default=os.pathsep,
+                      help="Path to the application's VirtualEnv, if explicitly set to '', use system python, if not specified, use directory <package_name> next to BASELINE")
+    parser.add_option('-d', '--deployment',
+                      dest='deployment',
+                      metavar='DIR',
+                      default='/usr/local/turbogears',
+                      help="Path where applications are installed, your app will be ${deployment}/package_name")
+    parser.add_option('-c', '--config',
+                      dest='config',
+                      action="store",
+                      default = 'production.ini',
+                      help="Name of the TurboGears2 configuration file (default production.ini)")
+    parser.add_option('-p', '--python',
+                      dest='python_version',
+                      default='python%s.%s'%( sys.version_info[:2] ),
+                      help="Python version for the deployment")
+    parser.add_option('-l', '--logging',
+                      dest='logging',
+                      action="store_true",
+                      default=False,
+                      help="Whether to enable logging for the config (default False)")
+    parser.add_option('-m', '--subsite',
+                      dest='mount',
+                      action="store",
+                      default = '',
+                      help="URL sub-path at which to mount the application default (/package or '/' if virtualhost specified), use '/' to mount as the root of the site")
+    parser.add_option('-H', '--virtualhost',
+                      dest='vhost',
+                      action="store",
+                      default = '',
+                      help="Virtual Host (Domain Name) to use for this configuration, such as 'myvirtual.mydomain.com', default is not to use a VirtualHost")
+    parser.add_option('-E', '--embedded-mode',
+                      dest='embedded',
+                      action='store_true',
+                      default=False,
+                      help="Use mod_wsgi embedded mode (only recommended on Win32)")
     def command(self):
         """Main command to create a modwsgi configuration files"""
+        logging.basicConfig(level=logging.INFO)
         #Output directory is current folder unless specified vi output command.
         output_dir = os.path.join(self.options.output_dir, 'apache')
         #Input where the templates are at.
@@ -110,12 +112,105 @@
         #Add package names
         vars['project']=plugins
         vars['package']=plugins
+        vars['deployment'] = self.options.deployment
+        vars['baseline'] = self.options.baseline
+        vars['python_version'] = self.options.python_version
+        vars['logging'] = self.options.logging
+        vars['vhost'] = self.options.vhost
+        vars['embedded'] = self.options.embedded
+        if self.options.virtualenv == os.pathsep and vars['baseline']:
+            # user didn't specify, use (calculated) default
+            # basically the package name next to baseline...
+            virtualenv = os.path.join(
+                os.path.dirname( vars['baseline'] ),
+                plugins,
+            )
+        elif self.options.virtualenv:
+            # explicit
+            virtualenv = self.options.virtualenv
+        else:
+            # not specified and no baseline
+            virtualenv = ''
+        vars['virtualenv'] = virtualenv
+        if self.options.vhost:
+            default_mount = '/'
+        else:
+            default_mount = '/%s'%( plugins, )
+        vars['mount'] = self.options.mount or default_mount
+        if not vars['mount'].endswith( '/' ):
+            vars['mount'] += '/'
+        vars['config'] = self.options.config
+
         vars['egg']=pluginlib.egg_name(str(dist_name))
-        
+
+        log.info(
+            'Generating Apache2 Configuration in %s with:\n%s',
+            output_dir,
+            pprint.pformat( vars ),
+        )
+        self.validate_vars( vars )
+
         #Copy my template direcotry to destination.
         copy_dir(input_dir, output_dir, vars, verbosity=1, simulate=False, use_cheetah=True)
-        print 'Thank you for using modwsgideploy!'
-        print 'Please read README.txt in apache folder.'
-        print 'http://lucasmanual.com/mywiki/modwsgideploy'
-        print 'Made in Chicago,IL USA'
+        log.info( 'Thank you for using modwsgideploy!' )
+        log.info( 'Please read README.txt in apache folder.' )
+        log.info( 'http://lucasmanual.com/mywiki/modwsgideploy' )
+        log.info( 'Made in Chicago,IL USA' )
 
+    def validate_vars( self, vars ):
+        """Validate variables and log warnings"""
+        if not os.path.exists( vars['deployment'] ):
+            log.warn(
+                "You need to create the deployment directory\n\tmkdir %s",
+                vars['deployment'],
+            )
+        final_dir = os.path.join( vars['deployment'], vars['package'] )
+        final_file = os.path.join( final_dir, vars['config'] )
+        egg_dir = os.path.join( final_dir, 'python-eggs' )
+        if not os.path.exists( final_dir ):
+            log.warn(
+                "You need to move/copy/checkout your project to the deployment directory:\n\tcp -r ../%s %s/\n\tchown -R www-data:www-data %s/%s",
+                vars['package'],
+                vars['deployment'],
+                vars['deployment'],vars['package'],
+            )
+        if not os.path.exists( final_file ):
+            log.warn(
+                'You need to create a %s file, edit it for production, and install it in %s:\n\tpaster make-config %s %s\n\tcp %s %s',
+                vars['config'],
+                final_dir,
+                vars['package'],
+                vars['config'],
+                vars['config'],
+                final_dir,
+            )
+        if not os.path.exists( egg_dir ):
+            log.warn(
+                'You need to create an egg-unpacking directory:\n\tmkdir %s\n\tchown www-data:www-data %s',
+                egg_dir,
+                egg_dir,
+            )
+        if not vars['baseline']:
+            log.warn(
+                "You have disabled BASELINE environment support, this is not recommended!",
+            )
+        elif not os.path.exists( vars['baseline'] ):
+            parent = os.path.dirname( vars['baseline'] )
+            log.warn(
+                "You need to create the BASELINE VirtualEnv:\n\tmkdir %s\n\tcd %s\n\tvirtualenv --no-site-packages %s\n\tchown -R www-data:www-data %s",
+                parent,
+                parent,
+                os.path.basename( vars['baseline'] ),
+                os.path.basename( vars['baseline'] ),
+            )
+        if vars['virtualenv'] and not os.path.exists( vars['virtualenv'] ):
+            log.warn(
+                "You need to create your application's VirtualEnv:\n\tmkdir %s\n\tcd %s\n\tvirtualenv --no-site-packages %s\n\tchown -R www-data:www-data %s\n\t#install packages into this virtualenv now",
+                vars['virtualenv'],
+                vars['virtualenv'],
+                os.path.basename( vars['virtualenv'] ),
+                os.path.basename( vars['virtualenv'] ),
+        )
+        if vars['embedded']:
+            log.warn( 'Embedded mode is not recommended for Linux or OSX servers' )
+        return vars
 
=== modified file 'trunk/modwsgideploy/templates/apache/+package+.wsgi_tmpl'
--- trunk/modwsgideploy/templates/apache/+package+.wsgi_tmpl	2009-10-17 18:05:06 +0000
+++ trunk/modwsgideploy/templates/apache/+package+.wsgi_tmpl	2010-03-08 17:56:30 +0000
@@ -1,51 +1,89 @@
-\#modwsgi script for $package
-
-\#1.Point to this script in your apache config file.
-\#Default location for all apps is:
-\#Debian:  /usr/local/turbogears/${package}
-
-\#2. Make sure apache user own the folder.
-\#Debian: chown -R www-data:www-data /usr/local/turbogears/${package}
-
+"""Apache mod_wsgi script for ${package}
+
+Point to this script in your apache config file.
+A template config file was generated as the file `${package}` sitting
+next to this file
+
+Make sure the apache user (normally www-data) owns your application's
+deployment path (${deployment}/${package}).  On Linux machines you can
+accomplish this with:
+
+.. code-block:: bash
+
+    sudo chown -R www-data:www-data ${deployment}/${package}
+
+#if $baseline
+The BASELINE pattern creates a root VirtualEnv on which your
+application-specific VirtualEnv's will be based, and which will
+can shared among potentially multiple projects.  If you haven't
+yet created the BASELINE VirtualEnv you can created it with:
+
+.. code-block:: bash
+
+    sudo mkdir /usr/local/pythonenv
+    sudo virtualenv --no-site-packages ${baseline}
+
+Make sure that the apache user owns the ${baseline} virtualenv.
+On Linux machines you can ensure this with:
+
+.. code-block:: bash
+
+    sudo chown -R www-data:www-data ${baseline}
+#else
+You have not configured BASELINE support.  If you wish to include it,
+either specify a --baseline=somedir parameter to `paster modwsgi_deploy`
+or leave off the baseline parameter entirely to use the default.
+#end if
+
+For details on BASELINE and the general mod_wsgi/VirtualEnv pattern
+used here, see:
+
+    http://code.google.com/p/modwsgi/wiki/VirtualEnvironments
+"""
 import sys
 
-\#3. start of virtualenv (enabled by default).
-\#Please comment out until 4 if you don't use virtualenv. 
-\#Make sure root owns the virtualenv folder. Example:(root:root)
-\#Create virtualenv if you didn't create it yet:
-\#mkdir /usr/local/pythonenv
-\#virtualenv --no-site-packages /usr/local/pythonenv/BASELINE
-
+#if $baseline
+\# This block provides support for the default virtualenv
+\# deployment pattern.  The option `--virtualenv=` on the
+\# `paster modwsgi_deploy` command line will skip this section entirely.
 prev_sys_path = list(sys.path)
 
-import site 
-site.addsitedir('/usr/local/pythonenv/BASELINE/lib/python2.5/site-packages')
+import site
+site.addsitedir('${virtualenv}/lib/${python_version}/site-packages')
 
-\#Move just added item to the front of the python system path. 
+\#Move just added item to the front of the python system path.
 \#Not needed if modwsgi>=3.0. Uncomment next 6 lines.
 new_sys_path = []
 for item in list(sys.path):
     if item not in prev_sys_path:
         new_sys_path.append(item)
         sys.path.remove(item)
-sys.path[:0] = new_sys_path 
-
-\#End of virtualenv
-
-\#4. Your website file location.
+sys.path[:0] = new_sys_path
+\#End of virtualenv support
+
+#end if
+\# This adds your project's root path to the PYTHONPATH so that you can import
+\# top-level modules from your project path.  This is how TurboGears QuickStarted
+\# projects are laid out by default.
 import os, sys
-sys.path.append('/usr/local/turbogears/${package}')
-
-\#5. Set the environment variable PYTHON_EGG_CACHE to an appropriate directory where the Apache user has write permission and into which it can unpack egg files.
-os.environ['PYTHON_EGG_CACHE'] = '/usr/local/turbogears/${package}/python-eggs'
-
-\#6.[Optional]If you want to enable logging you need to initialize logging. You also need to setup logger handlers in your production.ini. When done uncomment next two lines.
+sys.path.append('${deployment}/${package}')
+
+\# Set the environment variable PYTHON_EGG_CACHE to an appropriate directory
+\# where the Apache user has write permission and into which it can unpack egg files.
+os.environ['PYTHON_EGG_CACHE'] = '${deployment}/${package}/python-eggs'
+
+#if logging
+\# Initialize logging module from your TurboGears config file
+from paste.script.util.logging_config import fileConfig
+fileConfig('${deployment}/${package}/${config}')
+#else
+\# If you want to enable logging you need to initialize logging.
+\# You also need to setup logger handlers in your ${config}.
+\# When done uncomment next two lines.
 \#from paste.script.util.logging_config import fileConfig
-\#fileConfig('/usr/local/turbogears/${package}/production.ini')
+\#fileConfig('${deployment}/${package}/${config}')
+#end if
 
-\#7. Load your application production.ini file.
+\# Finally, load your application's ${config} file.
 from paste.deploy import loadapp
-application = loadapp('config:/usr/local/turbogears/${package}/production.ini')
-
-
-\#8.[Optional] If you want to test modwsgi only, uncomment section 3 in your /usr/local/turbogears/${package}/apache/${package}
+application = loadapp('config:${deployment}/${package}/${config}')
 
=== modified file 'trunk/modwsgideploy/templates/apache/+package+_tmpl'
--- trunk/modwsgideploy/templates/apache/+package+_tmpl	2009-10-21 21:13:01 +0000
+++ trunk/modwsgideploy/templates/apache/+package+_tmpl	2010-03-08 17:56:30 +0000
@@ -1,50 +1,71 @@
-\#Apache configuration File
-\#Read README.txt
-\#1. This file is the apache2 config file. It should be added to your apache config folder. If you mounting your app as a site wide package, you can rename the file to something like 002-${package} and put anything else that you want to be available in 001-someapp; When done copy to apache config folder. On Debian copy to /etc/apache2/sites-available/
-\#cp ./apache/${package} /etc/apache2/sites-available/${package}
-\#a2ensite ${package}
-
-
-\#Default location for tg2 project is /usr/local/turbogears/${package}. That is where you should put your project. This folder should be outside of apache location. Your package should not be installed into python site-package.
-
-\#2. Alias/Allow apache to serve static content.
-Alias /${package}/images /usr/local/turbogears/${package}/${package}/public/images
-Alias /${package}/css /usr/local/turbogears/${package}/${package}/public/css
-Alias /${package}/javascript /usr/local/turbogears/${package}/${package}/public/javascript
-
-\#[Optional] Embeded mode (http://example.com/${package}).For big websites with a lot of memory and visitors. As of version 0.4.16 deamon mode is default and it should be used on Linux. On windows use embeded mode.
- 
-\#WSGIScriptAlias /${package} /usr/local/turbogears/${package}/apache/${package}.wsgi
-
-\#3. Test if modwsgi is working. Uncomment below line, and go to http://localhost/test:
-\#WSGIScriptAlias /test /usr/local/turbogears/${package}/apache/test.wsgi
-
-\#4. [Optional] Sitewide (http://example.com/)
-\#Alias /images /usr/local/turbogears/${package}/${package}/public/images
-\#Alias /css /usr/local/turbogears/${package}/${package}/public/css
-\#Alias /javascript /usr/local/turbogears/${package}/${package}/public/javascript
-\#WSGIScriptAlias / /usr/local/turbogears/apache/${package}.wsgi
-
-\#5.Deamon mode with 10 threads and 3 processes. For small to medium website.
+\# Apache configuration File for ${package}
+\# Read README.txt
+\# This should be added to your apache config folder.
+\# If you are mounting your app as a site wide you can rename the file
+\# to something like `002-${package}`
+\# and put anything else that you want to be available in 001-someapp;
+\# When done editing this file copy to apache config folder.
+\# On Debian copy to /etc/apache2/sites-available/
+\#    cp ./apache/${package} /etc/apache2/sites-available/${package}
+\#    a2ensite ${package}
+
+\# Your TurboGears project needs to be installed at::
+\#    ${deployment}/${package}
+\# So that this file is present::
+\#    ${deployment}/${package}/${config}
+\# You can reconfigure this with::
+\#    paster modwsgi_deploy --deployment=somedir
+\# This folder should be outside of apache's "file" location.
+\# Your package should not be installed into python site-package.
+
+#if $baseline
+WSGIPythonHome ${baseline}
+#end if
+\# TODO: confirm that this line is appropriate for Daemon mode...
+WSGIPythonPath ${virtualenv}/lib/${python_version}/site-packages
+
+
+#if $vhost
+\# VirtualHost support is enabled:
+\# the '*' here specifies "all ip addresses on the host", you can use
+\# *:port to specify a non-standard port on all ip addresses, or specify
+\# a particular IP address rather than *
+\# This first line tells apache to enable Named Virtual Hosts on all IPs
+\# If you see a warning from Apache saying that NameVirtualHost *:80 has
+\# no virtual hosts, you likely are on Ubuntu and the base installation of
+\# Apache has set up an *:80 NameVirtualHost already, you can ignore the
+\# error or comment out the following line.
+
+NameVirtualHost *
+
+\# This block configures our particular named virtual host
+<VirtualHost *>
+    ServerName ${vhost}
+#end if
+\# Allow apache to serve static content.
+\# Your site is configured to mount at ${mount} (use --mount to change this)
+
+Alias ${mount}images ${deployment}/${package}/${package}/public/images
+Alias ${mount}css ${deployment}/${package}/${package}/public/css
+Alias ${mount}javascript ${deployment}/${package}/${package}/public/javascript
+
+\# Choose deamon mode with 10 threads and 3 processes.
+\# For small to medium website.
+#if not $embedded
 WSGIDaemonProcess ${package} threads=10 processes=3
 WSGIProcessGroup ${package}
-WSGIScriptAlias /${package} /usr/local/turbogears/${package}/apache/${package}.wsgi
+#end if
+WSGIScriptAlias ${mount} ${deployment}/${package}/apache/${package}.wsgi
 
-\#6. Directory Permission.
-<Directory /usr/local/turbogears/${package}/apache>
+\# Directory Permissions.
+<Directory ${deployment}/${package}/apache>
 Order deny,allow
 Allow from all
 </Directory>
 
-\#7. [Optional] If you want to use Virtualhost apache settings. 
-\#Sample Virtual Host configuration would look like this:
-
-\#<Directory /usr/local/turbogears/${package}/apache>
-\#    Order allow,deny
-\#    Allow from all
-\#</Directory>
-
-\#NameVirtualHost *:81
-\#<VirtualHost *:81>
-\#    WSGIScriptAlias / /usr/local/turbogears/${package}/apache/${package}.wsgi
-\#</VirtualHost>
+#if $vhost
+</VirtualHost>
+#else
+\# You have not specified a VirtualHost name, pass --virtualhost=my.example.com
+\# to paster modwsgi_deploy to use VirtualHost support.
+#end if
 
=== modified file 'trunk/modwsgideploy/templates/apache/README.txt_tmpl'
--- trunk/modwsgideploy/templates/apache/README.txt_tmpl	2009-10-17 18:05:06 +0000
+++ trunk/modwsgideploy/templates/apache/README.txt_tmpl	2010-03-08 17:56:30 +0000
@@ -1,37 +1,50 @@
-#Here is a numbered list of what you need to do to deploy your Turbogears2 or Pylons application. Follow 1 through 6. 
-
-#1. Create production.ini configuration file if its not there already. Example: 
-paster make-config ${package} production.ini
-#Edit production.ini and comment out the port settings, update the url for the production database.
-
-#2. Change or check the apache settings file.
-#Edit /usr/local/turbogears/${package}/apache/${package} and make sure it has the necessary apache configurations you need. Please update any paths if youi are placing your app somewehere other then /usr/local/turbogears/${package}/
-
-#Copy {$package} apache config file to apache folder. Example:
-cp /usr/local/turbogears/${package}/apache/${package} /etc/apache2/sites-available/${package}
-
-#3.Check if permissions are the same as other apache sites usually (root:root)
-
-ls -l /etc/apache2/sites-available/
-#You shoud see
-#total 16
-#-rw-r--r-- 1 root root  950 2008-08-08 13:06 default
-#-rw-r--r-- 1 root root 7366 2008-08-08 13:06 default-ssl
-#-rw-r--r-- 1 root root 1077 2008-11-08 12:38 ${package}
-
-#4.Enable your site.
-a2ensite ${package}
-
-#5. Check if your project has proper permissions, usually apache user. (Example: www-data:www-data on Debian).
-ls -l /usr/local/turbogears/${package}/apache/
-#total 16
-#-rw-r--r-- 1 www-data www-data 1077 2008-11-26 22:35 ${package}
-#-rw-r--r-- 1 www-data www-data 2319 2008-11-26 23:25 ${package}.wsgi
-#-rw-r--r-- 1 www-data www-data  594 2008-11-26 22:35 README.txt
-#-rw-r--r-- 1 www-data www-data  538 2008-11-26 22:35 test.wsgi
-
-#6.Reload apache
-/etc/init.d/apache2 reload
-
-
-#You are done. Your application should be working. Check the access.log, warn.log, and error.log in /var/log/apache to see if there are any errors. 
+Here is the process to deploy your Turbogears2 or Pylons application.
+
+# Create production.ini configuration file (if it's not there already). Example::
+
+    paster make-config ${package} production.ini
+
+  Edit production.ini and comment out the port settings, update the url
+  for the production database.
+
+# Change or check the apache settings file (sitting next to this README) and
+  install it.  Edit the file::
+
+    apache/${package}
+
+  and make sure it has the necessary apache configurations you need.
+  Note: you may wish to re-run paster modwsgi_deploy with other options
+  if you want to put your package in a nonstandard location.
+
+# Copy {$package} apache config file to apache folder. Example::
+
+    cp ${package}/apache/${package} /etc/apache2/sites-available/${package}
+
+# Check if permissions are the same as other apache sites usually (root:root)::
+
+    ls -l /etc/apache2/sites-available/
+    total 16
+    -rw-r--r-- 1 root root  950 2008-08-08 13:06 default
+    -rw-r--r-- 1 root root 7366 2008-08-08 13:06 default-ssl
+    -rw-r--r-- 1 root root 1077 2008-11-08 12:38 ${package}
+
+# Enable your site::
+
+    a2ensite ${package}
+
+# Check if your project has proper permissions, usually apache user.
+  (Example: www-data:www-data on Debian).::
+
+    ls -l /usr/local/turbogears/${package}/apache/
+    total 16
+    -rw-r--r-- 1 www-data www-data 1077 2008-11-26 22:35 ${package}
+    -rw-r--r-- 1 www-data www-data 2319 2008-11-26 23:25 ${package}.wsgi
+    -rw-r--r-- 1 www-data www-data  594 2008-11-26 22:35 README.txt
+    -rw-r--r-- 1 www-data www-data  538 2008-11-26 22:35 test.wsgi
+
+# Reload apache::
+
+    /etc/init.d/apache2 reload
+
+You are done. Your application should be working. Check the access.log,
+warn.log, and error.log in /var/log/apache to see if there are any errors.