Changeset - 36a35394b3cb
[Not reviewed]
default
0 2 0
Mads Kiilerich - 10 years ago 2015-08-20 17:29:55
madski@unity3d.com
docs: fix some confusing paste/paster typos
2 files changed with 6 insertions and 6 deletions:
0 comments (0 inline, 0 general)
docs/overview.rst
Show inline comments
 
@@ -66,43 +66,43 @@ installed.
 
  With this method, Kallithea is installed in the Python environment as any
 
  other package, usually as a ``.../site-packages/Kallithea-X-py2.7.egg/``
 
  directory with Python files and everything else that is needed.
 

	
 
  (``pip install kallithea`` from a source tree will do pretty much the same
 
  but build the Kallithea package itself locally instead of downloading it.)
 

	
 

	
 
Web server
 
----------
 

	
 
Kallithea is (primarily) a WSGI_ application that must be run from a web
 
server that expose WSGI as HTTP.
 
server that serves WSGI applications over HTTP.
 

	
 
- Kallithea uses the Paste_ tool for some admin tasks. Paste provides ``paste
 
- Kallithea uses the Paste_ tool for some admin tasks. Paste provides ``paster
 
  serve`` as a convenient way to launch Python WSGI / web servers.
 
  This method is perfect for development but *can* also be used for production.
 

	
 
  ``paste`` is a command line tool. Using it in production requires some way to
 
  wrap it as a managable service.
 
  ``paster`` is a command line tool. Using it in production requires some way to
 
  wrap it as a manageable service.
 

	
 
  Paste come with its own web server but Kallithea defaults to use Waitress_.
 
  Gunicorn_ is also an option. These web servers have different limited feature
 
  sets.
 

	
 
  It is also common/mandatory to put another web server or (reverse) proxy in
 
  front of these Python web servers. Nginx_ is a common choice. This simple
 
  setup will thus often end up being quite complex.
 

	
 
  The configuration of which web server to use is in the ini file passed to
 
  ``paste``. The entry point for the WSGI application is configured in
 
  ``paster``. The entry point for the WSGI application is configured in
 
  ``setup.py`` as ``kallithea.config.middleware:make_app``.
 

	
 
- `Apache httpd`_ can serve WSGI applications directly using mod_wsgi_ and a
 
  simple Python file with the necessary configuration. This is a good option if
 
  Apache is an option.
 

	
 
- IIS_ can also server WSGI applications directly using isapi-wsgi_.
 

	
 
- UWSGI_ is also an option.
 

	
 
The best option depends on what you are familiar with and the requirements for
 
performance and stability. Also, keep in mind that Kallithea mainly is serving
docs/usage/vcs_support.rst
Show inline comments
 
@@ -19,25 +19,25 @@ file ``kallithea/__init__.py`` and comme
 

	
 
Git support
 
-----------
 

	
 
Web server with chunked encoding
 
````````````````````````````````
 
Large Git pushes require an HTTP server with support for
 
chunked encoding for POST. The Python web servers waitress_ and
 
gunicorn_ (Linux only) can be used. By default, Kallithea uses
 
waitress_ for `paster serve` instead of the built-in `paste` WSGI
 
server.
 

	
 
The default paste server is controlled in the .ini file::
 
The paster server is controlled in the .ini file::
 

	
 
    use = egg:waitress#main
 

	
 
or::
 

	
 
    use = egg:gunicorn#main
 

	
 

	
 
Also make sure to comment out the following options::
 

	
 
    threadpool_workers =
 
    threadpool_max_requests =
0 comments (0 inline, 0 general)