kallithea Changeset - 7a1371d659c5

Changeset - 7a1371d659c5

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich (mads) - 6 years ago 2020-08-13 15:47:24
mads@kiilerich.com

docs: clarify how to activate virtualenv from mod_wsgi with py3

activate_this.py is not available with the venv module in py3. According to
https://modwsgi.readthedocs.io/en/develop/user-guides/virtual-environments.html
we just need to set python-home - that is the way to do proper virtualenv
activation, and there is no need for hacks in the wrapper script.

1 file changed with 4 insertions and 31 deletions:

docs/setup.rst

0 comments (0 inline, 0 general)

docs/setup.rst

➞

Show inline comments

@@ @@ -602,37 +602,19 @@ that, you'll need to: @@
     WSGIRestrictEmbedded On
 - Create a WSGI dispatch script, like the one below. Make sure you
   check that the paths correctly point to where you installed Kallithea
   and its Python Virtual Environment.
 - Create a WSGI dispatch script, like the one below. The ``WSGIDaemonProcess``
   ``python-home`` directive will make sure it uses the right Python Virtual
   Environment and that paste thus can pick up the right Kallithea
   application.
   .. code-block:: python
       import site
       site.addsitedir("/srv/kallithea/venv/lib/python3.7/site-packages")
       ini = '/srv/kallithea/my.ini'
       from logging.config import fileConfig
       fileConfig(ini, {'__file__': ini, 'here': '/srv/kallithea'})
       from paste.deploy import loadapp
       application = loadapp('config:' + ini)
   Or using proper virtualenv activation:
   .. code-block:: python
       activate_this = '/srv/kallithea/venv/bin/activate_this.py'
       execfile(activate_this, dict(__file__=activate_this))
       import os
       os.environ['HOME'] = '/srv/kallithea'
       ini = '/srv/kallithea/kallithea.ini'
       from logging.config import fileConfig
       fileConfig(ini, {'__file__': ini, 'here': '/srv/kallithea'})
       from paste.deploy import loadapp
       application = loadapp('config:' + ini)
 - Add the necessary ``WSGI*`` directives to the Apache Virtual Host configuration
   file, like in the example below. Notice that the WSGI dispatch script created
   above is referred to with the ``WSGIScriptAlias`` directive.
@@ @@ -657,15 +639,6 @@ that, you'll need to: @@
       WSGIScriptAlias / /srv/kallithea/dispatch.wsgi
       WSGIPassAuthorization On
   Or if using a dispatcher WSGI script with proper virtualenv activation:
   .. code-block:: apache
       WSGIDaemonProcess kallithea processes=5 threads=1 maximum-requests=100 lang=en_US.utf8
       WSGIProcessGroup kallithea
       WSGIScriptAlias / /srv/kallithea/dispatch.wsgi
       WSGIPassAuthorization On
 Other configuration files
 -------------------------

0 comments (0 inline, 0 general)