This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git
commit a51defadd31d3d66f1454cad45d9c63b05b3c8b2 Author: Marcus Christie <[email protected]> AuthorDate: Wed Nov 21 14:29:17 2018 -0500 limit wsgi processes on develop to reduce mem --- .../ansible/inventories/scigap/develop/group_vars/django/vars.yml | 3 ++- dev-tools/ansible/roles/django/defaults/main.yml | 2 ++ dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 | 2 +- dev-tools/ansible/roles/django/templates/django-vhost.conf.j2 | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml index c07f92f..ccc07de 100644 --- a/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml +++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml @@ -23,4 +23,5 @@ user: "pga" group: "pga" gateway_data_store_hostname: "pgadev.scigap.org" gateway_data_store_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e" -gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWgLve4J9WCohF/4UnbBZsh/nRkP1aM9FmA1FjKwK2gQAnKwhU+NrbsjW38h2Hi+8s9N2oZ9cCJHrvDi2U0cMxz4exIUBcVoRhw37ThlREHADeKR1FbKw0QLhTyfJb0K+1/8GWRluiFx0vHPptJe0KTqu+RJY0NSe+d/BEuGyCZ1hR+SKNuTgcb05Ia6opbSN5D68N9biseEux60d69ARQxLw+VN3Kr/UaBNpGIAfKLlLSUQlTyPA6G6UKCcJZv+/ye10oa0SK0qtrxMpL+4VJcVx+d56U7CUFWKEgPAaQrX1qdGUNDA7HKmD+EBtzw6DJqNJ0Cue/XuPe/RT62tpf" \ No newline at end of file +gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWgLve4J9WCohF/4UnbBZsh/nRkP1aM9FmA1FjKwK2gQAnKwhU+NrbsjW38h2Hi+8s9N2oZ9cCJHrvDi2U0cMxz4exIUBcVoRhw37ThlREHADeKR1FbKw0QLhTyfJb0K+1/8GWRluiFx0vHPptJe0KTqu+RJY0NSe+d/BEuGyCZ1hR+SKNuTgcb05Ia6opbSN5D68N9biseEux60d69ARQxLw+VN3Kr/UaBNpGIAfKLlLSUQlTyPA6G6UKCcJZv+/ye10oa0SK0qtrxMpL+4VJcVx+d56U7CUFWKEgPAaQrX1qdGUNDA7HKmD+EBtzw6DJqNJ0Cue/XuPe/RT62tpf" +django_wsgi_processes: 1 \ No newline at end of file diff --git a/dev-tools/ansible/roles/django/defaults/main.yml b/dev-tools/ansible/roles/django/defaults/main.yml index 2e4b44c..592adff 100644 --- a/dev-tools/ansible/roles/django/defaults/main.yml +++ b/dev-tools/ansible/roles/django/defaults/main.yml @@ -40,6 +40,8 @@ django_vhost_template: "django-vhost.conf.j2" django_ssl_vhost_template: "django-ssl-vhost.conf.j2" django_settings_local_template: "settings_local.py.j2" +django_wsgi_processes: 2 + ## Keycloak related variables tenant_domain: "{{ gateway_id }}" oauth_client_key: "RuLl_Uw7i_KXaLoAGJkiasTfyBYa" diff --git a/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 b/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 index aa31c48..14e57b7 100644 --- a/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 +++ b/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 @@ -49,7 +49,7 @@ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript </Directory> - WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP} python-home={{ doc_root_dir }}/venv python-path={{ doc_root_dir }}/airavata-django-portal processes=2 user={{ user }} group={{ group }} + WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP} python-home={{ doc_root_dir }}/venv python-path={{ doc_root_dir }}/airavata-django-portal processes={{ django_wsgi_processes }} user={{ user }} group={{ group }} WSGIProcessGroup {{ vhost_servername }} WSGIScriptAlias / {{ doc_root_dir }}/airavata-django-portal/django_airavata/wsgi.py diff --git a/dev-tools/ansible/roles/django/templates/django-vhost.conf.j2 b/dev-tools/ansible/roles/django/templates/django-vhost.conf.j2 index 90ebec8..767a4ce 100644 --- a/dev-tools/ansible/roles/django/templates/django-vhost.conf.j2 +++ b/dev-tools/ansible/roles/django/templates/django-vhost.conf.j2 @@ -40,7 +40,7 @@ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript </Directory> - WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP} python-home={{ doc_root_dir }}/venv python-path={{ doc_root_dir }}/airavata-django-portal processes=2 user={{ user }} group={{ group }} + WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP} python-home={{ doc_root_dir }}/venv python-path={{ doc_root_dir }}/airavata-django-portal processes={{ django_wsgi_processes }} user={{ user }} group={{ group }} WSGIProcessGroup {{ vhost_servername }} WSGIScriptAlias / {{ doc_root_dir }}/airavata-django-portal/django_airavata/wsgi.py
