diff --git a/README.md b/README.md index 6119fb698..d4775ca75 100644 --- a/README.md +++ b/README.md @@ -507,11 +507,13 @@ apache::vhost { 'wsgi.example.com': port => 80, docroot => '/var/www/pythonapp', wsgi_application_group => '%{GLOBAL}', - wsgi_daemon_process => 'wsgi', - wsgi_daemon_process_options => { - processes => 2, - threads => 15, - display-name => '%{GROUP}', + wsgi_daemon_process => { + 'wsgi' => { + processes => 2, + threads => 15, + display-name => '%{GROUP}', + }, + 'foo' => {}, }, wsgi_import_script => '/var/www/demo.wsgi', wsgi_import_script_options => { diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 7414a6f16..e1809e6d6 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -1188,12 +1188,14 @@ # apache::vhost { 'wsgi.example.com': # port => 80, # docroot => '/var/www/pythonapp', -# wsgi_daemon_process => 'wsgi', -# wsgi_daemon_process_options => -# { processes => 2, +# wsgi_daemon_process => { +# 'wsgi' => { +# processes => 2, # threads => 15, # display-name => '%{GROUP}', # }, +# 'foo' => {}, +# }, # wsgi_process_group => 'wsgi', # wsgi_script_aliases => { '/' => '/var/www/demo.wsgi' }, # wsgi_chunked_request => 'On', @@ -1201,6 +1203,7 @@ # ``` # # @param wsgi_daemon_process_options +# Deprecated, move to wsgi_daemon_process # Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside # wsgi_daemon_process, wsgi_process_group, # wsgi_script_aliases and wsgi_pass_authorization.