diff --git a/REFERENCE.md b/REFERENCE.md index 76106a38a1..e0b559df6b 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -10025,8 +10025,7 @@ Default value: `false` Data type: `Optional[Variant[String, Hash]]` Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -wsgi_daemon_process_options, wsgi_process_group, -wsgi_script_aliases and wsgi_pass_authorization.
+wsgi_process_group, wsgi_script_aliases and wsgi_pass_authorization.
A hash that sets the name of the WSGI daemon, accepting [certain keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html).
An example virtual host configuration with WSGI: @@ -10034,11 +10033,12 @@ An example virtual host configuration with WSGI: apache::vhost { 'wsgi.example.com': port => 80, docroot => '/var/www/pythonapp', - 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}' + } }, wsgi_process_group => 'wsgi', wsgi_script_aliases => { '/' => '/var/www/demo.wsgi' }, @@ -10052,10 +10052,7 @@ Default value: `undef` Data type: `Optional[Hash]` -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.
-Sets the group ID that the virtual host runs under. +DEPRECATED: Please add values inside Hash `wsgi_daemon_process`. Default value: `undef` @@ -10064,7 +10061,7 @@ Default value: `undef` Data type: `Optional[String]` Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, +wsgi_daemon_process, wsgi_process_group, and wsgi_pass_authorization.
This parameter defines the [`WSGIApplicationGroup directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIApplicationGroup.html), thus allowing you to specify which application group the WSGI application belongs to, @@ -10078,7 +10075,7 @@ Default value: `undef` Data type: `Optional[String]` Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, +wsgi_daemon_process, wsgi_process_group, and wsgi_pass_authorization.
This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html), which can be used in order to specify a script file to be loaded upon a process starting. @@ -10090,7 +10087,7 @@ Default value: `undef` Data type: `Optional[Hash]` Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, +wsgi_daemon_process, wsgi_process_group, and wsgi_pass_authorization.
This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html), which can be used in order to specify a script file to be loaded upon a process starting.
@@ -10103,7 +10100,7 @@ Default value: `undef` Data type: `Optional[Apache::OnOff]` Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, +wsgi_daemon_process, wsgi_process_group, and wsgi_pass_authorization.
This parameter defines the [`WSGIChunkedRequest directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIChunkedRequest.html), allowing you to enable support for chunked request content.
@@ -10117,7 +10114,7 @@ Default value: `undef` Data type: `Optional[String]` Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -wsgi_daemon_process, wsgi_daemon_process_options, +wsgi_daemon_process, wsgi_script_aliases and wsgi_pass_authorization.
Requires a hash of web paths to filesystem `.wsgi paths/`. @@ -10128,7 +10125,7 @@ Default value: `undef` Data type: `Optional[Hash]` Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, +wsgi_daemon_process, wsgi_process_group, and wsgi_pass_authorization.
Uses the WSGI application to handle authorization instead of Apache when set to `On`.
For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html). @@ -10140,7 +10137,7 @@ Default value: `undef` Data type: `Optional[Hash]` Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, +wsgi_daemon_process, wsgi_process_group, and wsgi_pass_authorization.
Uses the WSGI application to handle authorization instead of Apache when set to `On`.
This directive is similar to `wsgi_script_aliases`, but makes use of regular expressions @@ -10154,7 +10151,7 @@ Default value: `undef` Data type: `Optional[Apache::OnOff]` Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group and +wsgi_daemon_process, wsgi_process_group and wsgi_script_aliases.
Enables support for chunked requests. diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 03c86938b0..892f1d7431 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -1179,8 +1179,7 @@ # # @param wsgi_daemon_process # Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -# wsgi_daemon_process_options, wsgi_process_group, -# wsgi_script_aliases and wsgi_pass_authorization.
+# wsgi_process_group, wsgi_script_aliases and wsgi_pass_authorization.
# A hash that sets the name of the WSGI daemon, accepting # [certain keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html).
# An example virtual host configuration with WSGI: @@ -1188,27 +1187,24 @@ # apache::vhost { 'wsgi.example.com': # port => 80, # docroot => '/var/www/pythonapp', -# 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}' +# } # }, # wsgi_process_group => 'wsgi', # wsgi_script_aliases => { '/' => '/var/www/demo.wsgi' }, # wsgi_chunked_request => 'On', -# } # ``` # # @param wsgi_daemon_process_options -# 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.
-# Sets the group ID that the virtual host runs under. +# DEPRECATED: Please add values inside Hash `wsgi_daemon_process`. # # @param wsgi_application_group # Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -# wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, +# wsgi_daemon_process, wsgi_process_group, # and wsgi_pass_authorization.
# This parameter defines the [`WSGIApplicationGroup directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIApplicationGroup.html), # thus allowing you to specify which application group the WSGI application belongs to, @@ -1217,14 +1213,14 @@ # # @param wsgi_import_script # Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -# wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, +# wsgi_daemon_process, wsgi_process_group, # and wsgi_pass_authorization.
# This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html), # which can be used in order to specify a script file to be loaded upon a process starting. # # @param wsgi_import_script_options # Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -# wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, +# wsgi_daemon_process, wsgi_process_group, # and wsgi_pass_authorization.
# This parameter defines the [`WSGIImportScript directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIImportScript.html), # which can be used in order to specify a script file to be loaded upon a process starting.
@@ -1232,7 +1228,7 @@ # # @param wsgi_chunked_request # Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -# wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, +# wsgi_daemon_process, wsgi_process_group, # and wsgi_pass_authorization.
# This parameter defines the [`WSGIChunkedRequest directive`](https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIChunkedRequest.html), # allowing you to enable support for chunked request content.
@@ -1241,20 +1237,20 @@ # # @param wsgi_process_group # Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -# wsgi_daemon_process, wsgi_daemon_process_options, +# wsgi_daemon_process, # wsgi_script_aliases and wsgi_pass_authorization.
# Requires a hash of web paths to filesystem `.wsgi paths/`. # # @param wsgi_script_aliases # Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -# wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, +# wsgi_daemon_process, wsgi_process_group, # and wsgi_pass_authorization.
# Uses the WSGI application to handle authorization instead of Apache when set to `On`.
# For more information, see mod_wsgi's [WSGIPassAuthorization documentation](https://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html). # # @param wsgi_script_aliases_match # Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -# wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group, +# wsgi_daemon_process, wsgi_process_group, # and wsgi_pass_authorization.
# Uses the WSGI application to handle authorization instead of Apache when set to `On`.
# This directive is similar to `wsgi_script_aliases`, but makes use of regular expressions @@ -1263,7 +1259,7 @@ # # @param wsgi_pass_authorization # Sets up a virtual host with [WSGI](https://github.com/GrahamDumpleton/mod_wsgi) alongside -# wsgi_daemon_process, wsgi_daemon_process_options, wsgi_process_group and +# wsgi_daemon_process, wsgi_process_group and # wsgi_script_aliases.
# Enables support for chunked requests. # diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md index c38d0358d5..82c59e4fa3 100644 --- a/readmes/README_ja_JP.md +++ b/readmes/README_ja_JP.md @@ -558,12 +558,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}' + } + }, wsgi_import_script => '/var/www/demo.wsgi', wsgi_import_script_options => { process-group => 'wsgi',