This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch AIRAVATA-3698--Add-support-for-Python-3.11
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to
refs/heads/AIRAVATA-3698--Add-support-for-Python-3.11 by this push:
new e8a711a2fc AIRAVATA-3698 Referenc Django virtual env directory in
vhost conf
e8a711a2fc is described below
commit e8a711a2fcd673f03d80428965b6824a4cdec08a
Author: Marcus Christie <[email protected]>
AuthorDate: Tue Jun 27 11:11:04 2023 -0400
AIRAVATA-3698 Referenc Django virtual env directory in vhost conf
---
.../scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 4 ++--
.../scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2 | 4 ++--
.../scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 4 ++--
dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 | 2 +-
dev-tools/ansible/roles/django/templates/django-vhost.conf.j2 | 4 ++--
5 files changed, 9 insertions(+), 9 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..bc0426fcd6 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,7 @@
</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={{ django_venv_dir }} 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/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..b8d95b425c 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,7 @@
</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={{ django_venv_dir }} 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/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..9f63307c97 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,7 @@
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={{ django_venv_dir }} 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-ssl-vhost.conf.j2
b/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2
index 0764c34bd2..e9e611aea9 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
@@ -101,7 +101,7 @@
WSGIDaemonProcess {{ vhost_servername }} \
display-name=%{GROUP} \
- python-home={{ doc_root_dir }}/venv \
+ python-home={{ django_venv_dir }} \
python-path={{ doc_root_dir }}/airavata-django-portal \
processes={{ django_wsgi_processes }} \
user={{ user }} \
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..d9e54a8b2e 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,7 @@
{% 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={{ django_venv_dir }} 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
