This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch AIRAVATA-3697
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/AIRAVATA-3697 by this push:
new 71bc7c3d30 AIRAVATA-3697 Set lang and locale on WSGIDaemonProcess
71bc7c3d30 is described below
commit 71bc7c3d30e34daef0b308de15092f00cfe821cb
Author: Marcus Christie <[email protected]>
AuthorDate: Tue Sep 19 09:54:06 2023 -0400
AIRAVATA-3697 Set lang and locale on WSGIDaemonProcess
Copying this change over from the template to the per gateway override
files.
---
.../develop/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 12 ++++++++++--
.../production/host_vars/dreg/files/django-ssl-vhost.conf.j2 | 12 ++++++++++--
.../host_vars/simccs/files/django-ssl-vhost.conf.j2 | 12 ++++++++++--
.../staging/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 12 ++++++++++--
.../ansible/roles/django/templates/django-vhost.conf.j2 | 12 ++++++++++--
5 files changed, 50 insertions(+), 10 deletions(-)
diff --git
a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
index 2e482d25b2..da87e8c448 100644
---
a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
+++
b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
@@ -43,7 +43,7 @@
# Reverse proxy to geoserver on gf8
ProxyPass /geoserver "http://gf8.ucs.indiana.edu/geoserver";
ProxyPassReverse /geoserver "http://gf8.ucs.indiana.edu/geoserver";
-
+
Alias /robots.txt {{ doc_root_dir }}/static/robots.txt
Alias /favicon.ico {{ doc_root_dir }}/static/favicon.ico
@@ -68,7 +68,15 @@
</Directory>
{% endfor %}
- 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 }}
+ 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 }} \
+ lang=en_US.UTF-8 \
+ locale=en_US.UTF-8
WSGIProcessGroup {{ vhost_servername }}
WSGIScriptAlias / {{ doc_root_dir
}}/airavata-django-portal/django_airavata/wsgi.py
diff --git
a/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
b/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
index 60606670c7..343f74686b 100644
---
a/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
+++
b/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
@@ -29,7 +29,7 @@
<VirtualHost *:{{ httpd_default_http_port }}>
ServerName {{ vhost_servername }}
-
+
## Redirect all http traffic to https
RewriteEngine On
RewriteCond %{HTTPS} off
@@ -66,7 +66,15 @@
</Directory>
{% endfor %}
- 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 }}
+ 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 }} \
+ lang=en_US.UTF-8 \
+ locale=en_US.UTF-8
WSGIProcessGroup {{ vhost_servername }}
WSGIScriptAlias / {{ doc_root_dir
}}/airavata-django-portal/django_airavata/wsgi.py
diff --git
a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
index 6090cd119f..0c4a8614a7 100644
---
a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
+++
b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
@@ -43,7 +43,7 @@
# Reverse proxy to geoserver on gf8
ProxyPass /geoserver "http://gf8.ucs.indiana.edu/geoserver";
ProxyPassReverse /geoserver "http://gf8.ucs.indiana.edu/geoserver";
-
+
Alias /robots.txt {{ doc_root_dir }}/static/robots.txt
Alias /favicon.ico {{ doc_root_dir }}/static/favicon.ico
@@ -60,7 +60,15 @@
Require all granted
</Directory>
- 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 }}
+ 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 }} \
+ lang=en_US.UTF-8 \
+ locale=en_US.UTF-8
WSGIProcessGroup {{ vhost_servername }}
WSGIScriptAlias / {{ doc_root_dir
}}/airavata-django-portal/django_airavata/wsgi.py
diff --git
a/dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/files/django-ssl-vhost.conf.j2
b/dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/files/django-ssl-vhost.conf.j2
index b6be6dac00..6cdcf0c6ce 100644
---
a/dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/files/django-ssl-vhost.conf.j2
+++
b/dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/files/django-ssl-vhost.conf.j2
@@ -42,7 +42,7 @@
# Reverse proxy to geoserver on gf8
ProxyPass /geoserver "http://gf8.ucs.indiana.edu/geoserver";
ProxyPassReverse /geoserver "http://gf8.ucs.indiana.edu/geoserver";
-
+
Alias /robots.txt {{ doc_root_dir }}/static/robots.txt
Alias /favicon.ico {{ doc_root_dir }}/static/favicon.ico
@@ -59,7 +59,15 @@
Require all granted
</Directory>
- 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 }}
+ 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 }} \
+ lang=en_US.UTF-8 \
+ locale=en_US.UTF-8
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 db95fb6e01..48779b5895 100644
--- a/dev-tools/ansible/roles/django/templates/django-vhost.conf.j2
+++ b/dev-tools/ansible/roles/django/templates/django-vhost.conf.j2
@@ -30,7 +30,7 @@
<VirtualHost *:{{ httpd_default_http_port }}>
ServerName {{ vhost_servername }}
TimeOut {{ vhost_timeout }}
-
+
Alias /robots.txt {{ doc_root_dir }}/static/robots.txt
Alias /favicon.ico {{ doc_root_dir }}/static/favicon.ico
@@ -75,7 +75,15 @@
{% endif %}
{% endfor %}
- 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 }}
+ 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 }} \
+ lang=en_US.UTF-8 \
+ locale=en_US.UTF-8
WSGIProcessGroup {{ vhost_servername }}
WSGIScriptAlias / {{ doc_root_dir
}}/airavata-django-portal/django_airavata/wsgi.py
