diff --git a/CHANGES.rst b/CHANGES.rst index a1d3353e12df57aa965165a5db92db212b259b92..0dc9197d38ed7fbea6aa4a2a149d087e00f85cfc 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -96,7 +96,7 @@ Released on March 27th 2015. - Return fault code and description on RPC service errors (`#31 <https://github.com/LUMC/mutalyzer/pull/31>`_). -- Use esummary 2.0 response format (`#31 +- Use esummary 2.0 response format (`#32 <https://github.com/LUMC/mutalyzer/pull/32>`_). diff --git a/README.rst b/README.rst index 996520f0d1b277372126fef3816acc1961dabb86..540bc7cce4cd49590033f77bfd34cf5131bf10fc 100644 --- a/README.rst +++ b/README.rst @@ -15,6 +15,11 @@ submit bug reports and feature requests. Developer documentation is `hosted at Read The Docs <http://mutalyzer.readthedocs.org>`_. +If you're interested in running your own Mutalyzer installation, please have a +look at our `Mutalyzer Ansible role +<https://github.com/mutalyzer/ansible-role-mutalyzer>`_ for a completely +automated deployment. + Contributing ------------ diff --git a/doc/config.rst b/doc/config.rst index f956fee5d67bc90ad15306c7f4d77869f5c10978..3f31f863faac90889a5a69f4416c2c7669553050 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -174,6 +174,8 @@ LOG_TIME_FORMAT Website settings ^^^^^^^^^^^^^^^^ +.. _config-reverse-proxied: + REVERSE_PROXIED If set to `True`, the WSGI application runs behind a reverse proxy (e.g., nginx using ``proxy_pass``). This needs to be set if the application is diff --git a/doc/deploy.rst b/doc/deploy.rst index ca0d90b219d1182c0cec7ad02ec93bf9ed0fdb1f..ab75f0e80f43f860e14ba862771569b049360f76 100644 --- a/doc/deploy.rst +++ b/doc/deploy.rst @@ -18,17 +18,21 @@ containers such as `Gunicorn`_. Below we briefly describe our recommended setup for a production environment using Gunicorn, nginx and Supervisor. +See :ref:`deploy_ansible` for a solution to completely automate this. + Configuration settings ---------------------- -It is recommended to at least set the following configuration settings: +At a minimum, it is recommended to have a look at the following configuration +settings: - :ref:`EMAIL <config-email>` - :ref:`DEBUG <config-debug>` - :ref:`CACHE_DIR <config-cache-dir>` - :ref:`SOAP_WSDL_URL <config-soap-wsdl-url>` - :ref:`JSON_ROOT_URL <config-json-root-url>` +- :ref:`REVERSE_PROXIED <config-reverse-proxied>` WSGI application server: Gunicorn @@ -150,6 +154,8 @@ website: environment=MUTALYZER_SETTINGS="/opt/mutalyzer/conf/settings.py" +.. _deploy_ansible: + Automated deployment with Ansible --------------------------------- diff --git a/doc/index.rst b/doc/index.rst index 122f99ec5cb0a89653861d1ef8462983997fc140..1fb9a74f197413ddb4e0ab29c19d45a0f5d4fa01 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -4,6 +4,9 @@ Mutalyzer developer documentation Mutalyzer is an HGVS variant nomenclature checker. The canonical Mutalyzer installation can be found at `mutalyzer.nl <https://mutalyzer.nl>`_. +.. note:: If you're looking into running your own Mutalyzer installation, you + might be interested in :ref:`deploy_ansible`. + This is the developer documentation for Mutalyzer. User documentation can be found on the `wiki <https://humgenprojects.lumc.nl/trac/mutalyzer>`_. diff --git a/doc/install.rst b/doc/install.rst index c070d0fa960512ffb731d798cc55cdb08a61ba1e..35fdbaad508eba1a6cfb29f34bfc11e6400928d0 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -5,6 +5,10 @@ Installation ============ +.. note:: If you're looking into deploying Mutayzer in a production + environment (as opposed to a local development installation), please see + :ref:`deploy`. + Mutalyzer depends on a database server, `Python`_ 2.7, and several Python packages. `Redis`_ is a soft dependency. This section walks you through installing Mutalyzer with Redis and using `PostgreSQL`_ as database server, diff --git a/doc/testing.rst b/doc/testing.rst index 7556564523df75b5497cb01f7f303536396e17d2..ccf2189f84bd1bc5c1cd6379601f072567f6bff8 100644 --- a/doc/testing.rst +++ b/doc/testing.rst @@ -16,7 +16,7 @@ the Mutalyzer source directory. tests. By default, the tests use an in-memory SQLite database. This can be customized -with the ``--database-uri` command line argument and a valid `SQLAlchemy +with the ``--database-uri`` command line argument and a valid `SQLAlchemy connection URI <http://docs.sqlalchemy.org/en/rel_1_0/core/engines.html#database-urls>`_ (obviously, the contents of this database will be lost). For example, to use diff --git a/mutalyzer/website/templates/about.html b/mutalyzer/website/templates/about.html index d6ef86be82847dd03cbd1a52a1daa92c123d63c5..0e16c0c2e13edbe05343c613b615bec7a13e5b27 100644 --- a/mutalyzer/website/templates/about.html +++ b/mutalyzer/website/templates/about.html @@ -70,6 +70,13 @@ Development of Mutalyzer happens on GitHub: <a href="https://github.com/mutalyzer/mutalyzer">github.com/mutalyzer/mutalyzer</a> </p> +<p> +If you're interested in running your own Mutalyzer installation, please have a +look at +our <a href="https://github.com/mutalyzer/ansible-role-mutalyzer">Mutalyzer +Ansible role</a> for a completely automated deployment. +</p> + <h2>Sponsors</h2> <p>