From 66ba3bd80231a2a0687cb7a7e7bdf05064540609 Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Thu, 2 Oct 2014 12:46:56 -0400 Subject: [PATCH] Clean up the middleware docs Used code blocks when possible, and a minimal amount of highlighting keywords. Change-Id: Ie1dad50cc44afc6ce841e87f2ee9de3149e72117 --- doc/source/middlewarearchitecture.rst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/source/middlewarearchitecture.rst b/doc/source/middlewarearchitecture.rst index 596c1269..80b93ac5 100644 --- a/doc/source/middlewarearchitecture.rst +++ b/doc/source/middlewarearchitecture.rst @@ -111,7 +111,9 @@ Configuration ------------- The middleware is configured within the config file of the main application as -a WSGI component. Example for the auth_token middleware:: +a WSGI component. Example for the auth_token middleware: + +.. code-block:: ini [app:myService] paste.app_factory = myService:app_factory @@ -255,15 +257,18 @@ a WSGI component. Example for the auth_token middleware:: For services which have a separate paste-deploy ini file, auth_token middleware can be alternatively configured in [keystone_authtoken] section in the main config file. For example in Nova, all middleware parameters can be removed -from api-paste.ini:: +from ``api-paste.ini``: + +.. code-block:: ini [filter:authtoken] paste.filter_factory = keystonemiddleware.auth_token:filter_factory -and set in nova.conf:: +and set in ``nova.conf``: + +.. code-block:: ini [DEFAULT] - ... auth_strategy=keystone [keystone_authtoken]