From e0be39030a84aff942da98f3ebb95f08c7975d1d Mon Sep 17 00:00:00 2001 From: Oscar Virot Date: Mon, 10 Jun 2024 16:52:25 +0200 Subject: [PATCH 1/4] Update README.md --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6119fb6983..9e7622c738 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 => { From d8d392be1d5c693130519824f179cf713ef749aa Mon Sep 17 00:00:00 2001 From: Oscar Virot Date: Mon, 10 Jun 2024 16:53:23 +0200 Subject: [PATCH 2/4] Update vhost.pp --- manifests/vhost.pp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 7414a6f165..309efedf2d 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, -# threads => 15, +# 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 +# Depricated, 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.
From 9f762acd8cbbb9fca8179a4e373034b94141c706 Mon Sep 17 00:00:00 2001 From: Oscar Virot Date: Mon, 17 Jun 2024 13:26:55 +0200 Subject: [PATCH 3/4] Update manifests/vhost.pp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Romain Tartière --- manifests/vhost.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 309efedf2d..4bae1f0509 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -1203,7 +1203,7 @@ # ``` # # @param wsgi_daemon_process_options -# Depricated, move to wsgi_daemon_process +# 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.
From 55079a0d02118e7e8ba03bcb2d4bea12e478a73e Mon Sep 17 00:00:00 2001 From: Oscar Virot Date: Mon, 17 Jun 2024 13:34:48 +0200 Subject: [PATCH 4/4] Switch string to Int for documentation Template does not care: WSGIDaemonProcess <%= $key %> <%= join(sort($val.map |$k,$v| { "$k=$v"}), ' ') %> --- README.md | 4 ++-- manifests/vhost.pp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9e7622c738..d4775ca753 100644 --- a/README.md +++ b/README.md @@ -509,8 +509,8 @@ apache::vhost { 'wsgi.example.com': wsgi_application_group => '%{GLOBAL}', wsgi_daemon_process => { 'wsgi' => { - processes => '2', - threads => '15', + processes => 2, + threads => 15, display-name => '%{GROUP}', }, 'foo' => {}, diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 309efedf2d..3c1c36948b 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -1190,8 +1190,8 @@ # docroot => '/var/www/pythonapp', # wsgi_daemon_process => { # 'wsgi' => { -# processes => '2', -# threads => '15', +# processes => 2, +# threads => 15, # display-name => '%{GROUP}', # }, # 'foo' => {},