mirror of https://github.com/Aidaho12/haproxy-wi
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.pull/390/head
parent
5033cc9667
commit
730e145ab8
|
@ -176,7 +176,7 @@ def generate_service_inv(json_data: json, installed_service: str) -> object:
|
||||||
is_docker = json_data['services'][installed_service]['docker']
|
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'):
|
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():
|
for k, v in json_data['servers'].items():
|
||||||
server_ip = v['ip']
|
server_ip = v['ip']
|
||||||
|
|
|
@ -22,8 +22,9 @@
|
||||||
WSGIDaemonProcess roxy-wi-api display-name=%{GROUP} user=apache group=apache processes=1 threads=5
|
WSGIDaemonProcess roxy-wi-api display-name=%{GROUP} user=apache group=apache processes=1 threads=5
|
||||||
WSGIScriptAlias /api /var/www/haproxy-wi/api/app.wsgi
|
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
|
WSGIScriptAlias /app /var/www/haproxy-wi/app/app.wsgi
|
||||||
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
|
|
||||||
<Directory /var/www/haproxy-wi/app/>
|
<Directory /var/www/haproxy-wi/app/>
|
||||||
WSGIProcessGroup roxy-wi-app
|
WSGIProcessGroup roxy-wi-app
|
||||||
|
|
|
@ -22,8 +22,9 @@
|
||||||
WSGIDaemonProcess roxy-wi-api display-name=%{GROUP} user=www-data group=www-data processes=1 threads=5
|
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
|
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
|
WSGIScriptAlias /app /var/www/haproxy-wi/app/app.wsgi
|
||||||
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
|
|
||||||
<Directory /var/www/haproxy-wi/app/>
|
<Directory /var/www/haproxy-wi/app/>
|
||||||
WSGIProcessGroup roxy-wi-app
|
WSGIProcessGroup roxy-wi-app
|
||||||
|
|
Loading…
Reference in New Issue