From 730e145ab8d9011088c95ed9198487e8c519218d Mon Sep 17 00:00:00 2001 From: Aidaho Date: Wed, 17 Jul 2024 08:42:11 +0300 Subject: [PATCH] v7.3.2.0: Update WSGI configurations and Ansible version Updated the WSGIDaemonProcess for roxy-wi-app to include a request timeout. The WSGIApplicationGroup was also added to the httpd configurations. Additionally, the Ansible galaxy command in the installation.py script has been updated to use nginxinc.nginx version 0.24.3 instead of 0.24.1. --- app/modules/service/installation.py | 2 +- config_other/httpd/roxy-wi.conf | 3 ++- config_other/httpd/roxy-wi_deb.conf | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/modules/service/installation.py b/app/modules/service/installation.py index dc2f29df..b4dc56a8 100644 --- a/app/modules/service/installation.py +++ b/app/modules/service/installation.py @@ -176,7 +176,7 @@ def generate_service_inv(json_data: json, installed_service: str) -> object: is_docker = json_data['services'][installed_service]['docker'] if installed_service == 'nginx' and not os.path.isdir('/var/www/haproxy-wi/app/scripts/ansible/roles/nginxinc.nginx'): - os.system('ansible-galaxy install nginxinc.nginx,0.24.1 --roles-path /var/www/haproxy-wi/app/scripts/ansible/roles/') + os.system('ansible-galaxy install nginxinc.nginx,0.24.3 --roles-path /var/www/haproxy-wi/app/scripts/ansible/roles/') for k, v in json_data['servers'].items(): server_ip = v['ip'] diff --git a/config_other/httpd/roxy-wi.conf b/config_other/httpd/roxy-wi.conf index 8c263a11..24b09885 100644 --- a/config_other/httpd/roxy-wi.conf +++ b/config_other/httpd/roxy-wi.conf @@ -22,8 +22,9 @@ WSGIDaemonProcess roxy-wi-api display-name=%{GROUP} user=apache group=apache processes=1 threads=5 WSGIScriptAlias /api /var/www/haproxy-wi/api/app.wsgi - WSGIDaemonProcess roxy-wi-app display-name=%{GROUP} user=apache group=apache processes=5 threads=20 + WSGIDaemonProcess roxy-wi-app request-timeout=60 display-name=%{GROUP} user=apache group=apache processes=10 threads=20 WSGIScriptAlias /app /var/www/haproxy-wi/app/app.wsgi + WSGIApplicationGroup %{GLOBAL} WSGIProcessGroup roxy-wi-app diff --git a/config_other/httpd/roxy-wi_deb.conf b/config_other/httpd/roxy-wi_deb.conf index 45f07961..94d4f4a8 100644 --- a/config_other/httpd/roxy-wi_deb.conf +++ b/config_other/httpd/roxy-wi_deb.conf @@ -22,8 +22,9 @@ WSGIDaemonProcess roxy-wi-api display-name=%{GROUP} user=www-data group=www-data processes=1 threads=5 WSGIScriptAlias /api /var/www/haproxy-wi/api/app.wsgi - WSGIDaemonProcess roxy-wi-app display-name=%{GROUP} user=www-data group=www-data processes=5 threads=20 + WSGIDaemonProcess roxy-wi-app request-timeout=60 display-name=%{GROUP} user=www-data group=www-data processes=5 threads=20 WSGIScriptAlias /app /var/www/haproxy-wi/app/app.wsgi + WSGIApplicationGroup %{GLOBAL} WSGIProcessGroup roxy-wi-app