You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/03/27 13:19:09 UTC
[airavata] branch master updated (c858046 -> 5bef547)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from c858046 Added the new PACE gateway URL
new dcca0fd Ansible: control setting django KEYCLOAK_CA_CERTFILE setting
new 5bef547 Ansible: comment out django_keycloak_ca_certfile_path for iam.scigap.org
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ansible/inventories/scigap/develop/group_vars/django/vars.yml | 2 ++
.../inventories/scigap/production/group_vars/django/vars.yml | 1 +
.../ansible/inventories/scigap/staging/group_vars/django/vars.yml | 1 +
dev-tools/ansible/roles/django/defaults/main.yml | 7 +++++++
dev-tools/ansible/roles/django/templates/settings_local.py.j2 | 4 +++-
5 files changed, 14 insertions(+), 1 deletion(-)
[airavata] 01/02: Ansible: control setting django
KEYCLOAK_CA_CERTFILE setting
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit dcca0fd102f5bee0b355761f207ca2d29aa693b5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jan 31 16:07:28 2020 -0500
Ansible: control setting django KEYCLOAK_CA_CERTFILE setting
---
.../ansible/inventories/scigap/develop/group_vars/django/vars.yml | 2 ++
.../inventories/scigap/production/group_vars/django/vars.yml | 1 +
.../ansible/inventories/scigap/staging/group_vars/django/vars.yml | 1 +
dev-tools/ansible/roles/django/defaults/main.yml | 7 +++++++
dev-tools/ansible/roles/django/templates/settings_local.py.j2 | 4 +++-
5 files changed, 14 insertions(+), 1 deletion(-)
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 b11864b..2a544e5 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
@@ -30,3 +30,5 @@ django_error_emails: "[('Marcus Christie', 'machrist@iu.edu'), ('Eroma Abeysingh
django_database_name: "django_{{ gateway_id }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
django_tus_endpoint: "https://tus.dev.scigap.org/files/"
+airavata_django_git_branch: "develop"
+django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
index 18d35f3..7f94267 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
@@ -28,6 +28,7 @@ doc_root_dir: "/var/www/portals/django-{{gateway_id}}"
django_database_name: "django_{{ inventory_hostname }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
django_tus_endpoint: "https://tus.airavata.org/files/"
+django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
# Default email settings
portal_email_host: "smtp.gmail.com"
diff --git a/dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml
index 76c4dc5..977fcce 100644
--- a/dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml
@@ -28,6 +28,7 @@ doc_root_dir: "/var/www/portals/django-{{gateway_id}}"
django_database_name: "django_{{ inventory_hostname }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
django_tus_endpoint: "https://tus.staging.scigap.org/files/"
+django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
# Default email settings
portal_email_host: "smtp.gmail.com"
diff --git a/dev-tools/ansible/roles/django/defaults/main.yml b/dev-tools/ansible/roles/django/defaults/main.yml
index 47c452c..7cf6d69 100644
--- a/dev-tools/ansible/roles/django/defaults/main.yml
+++ b/dev-tools/ansible/roles/django/defaults/main.yml
@@ -46,6 +46,13 @@ django_hidden_airavata_apps: "[]"
django_tus_data_dir: "{{user_data_dir}}/tus-temp-dir"
django_file_upload_max_file_size_mb: 64
+# Should be a python expression that evaluates to a string representing a file path. For example:
+# django_keycloak_ca_certfile_path: "/etc/ca.pem"
+# or
+# django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
+# By default it has no value meaning system default CA certs will be used for validation.
+django_keycloak_ca_certfile_path:
+
django_wsgi_processes: 2
django_debug: false
diff --git a/dev-tools/ansible/roles/django/templates/settings_local.py.j2 b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
index d0ac9cb..c7d7eb2 100644
--- a/dev-tools/ansible/roles/django/templates/settings_local.py.j2
+++ b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
@@ -75,7 +75,9 @@ KEYCLOAK_AUTHORIZE_URL = '{{ oauth_service_url }}/realms/{{ tenant_domain }}/pro
KEYCLOAK_TOKEN_URL = '{{ oauth_service_url }}/realms/{{ tenant_domain }}/protocol/openid-connect/token'
KEYCLOAK_USERINFO_URL = '{{ oauth_service_url }}/realms/{{ tenant_domain }}/protocol/openid-connect/userinfo'
KEYCLOAK_LOGOUT_URL = '{{ oauth_service_url }}/realms/{{ tenant_domain }}/protocol/openid-connect/logout'
-KEYCLOAK_CA_CERTFILE = os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")
+{% if django_keycloak_ca_certfile_path %}
+KEYCLOAK_CA_CERTFILE = {{ django_keycloak_ca_certfile_path }}
+{% endif %}
KEYCLOAK_VERIFY_SSL = True
AUTHENTICATION_OPTIONS = {
[airavata] 02/02: Ansible: comment out
django_keycloak_ca_certfile_path for iam.scigap.org
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 5bef547c106391031f8d038f7883df017536e922
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Fri Mar 27 09:14:01 2020 -0400
Ansible: comment out django_keycloak_ca_certfile_path for iam.scigap.org
Using Letsencrypt cert now
---
.../ansible/inventories/scigap/production/group_vars/django/vars.yml | 2 +-
dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
index 7f94267..8f5d4a8 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
@@ -28,7 +28,7 @@ doc_root_dir: "/var/www/portals/django-{{gateway_id}}"
django_database_name: "django_{{ inventory_hostname }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
django_tus_endpoint: "https://tus.airavata.org/files/"
-django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
+# django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
# Default email settings
portal_email_host: "smtp.gmail.com"
diff --git a/dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml
index 977fcce..861ca9e 100644
--- a/dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml
@@ -28,7 +28,7 @@ doc_root_dir: "/var/www/portals/django-{{gateway_id}}"
django_database_name: "django_{{ inventory_hostname }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
django_tus_endpoint: "https://tus.staging.scigap.org/files/"
-django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
+# django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
# Default email settings
portal_email_host: "smtp.gmail.com"