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 7ac5d08b51655be44a6090909bf31036aa0334dd Author: Marcus Christie <[email protected]> AuthorDate: Wed Jul 6 12:06:21 2022 -0400 Ansible: js2 inventory for Django portals --- .../scigap/develop-js2/group_vars/django/vars.yml | 11 +++++++---- .../inventories/scigap/develop-js2/host_vars/geo/vars.yml | 13 +++++-------- .../scigap/develop-js2/host_vars/interactwel/vars.yml | 12 ++++-------- .../scigap/develop-js2/host_vars/rnamake/vars.yml | 10 ++++------ .../scigap/develop-js2/host_vars/seagrid/vars.yml | 10 +++++----- .../scigap/develop-js2/host_vars/simccs/vars.yml | 5 ++--- 6 files changed, 27 insertions(+), 34 deletions(-) diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/django/vars.yml index b5e9ba4f0f..2d710f7d25 100644 --- a/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/django/vars.yml +++ b/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/django/vars.yml @@ -21,16 +21,19 @@ --- 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_hostname: "web.dev.scigap.org" +# gateway_data_store_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e" +gateway_data_store_resource_id: "web.dev.scigap.org_ba01452f-44e5-4e03-b35f-756630539198" django_wsgi_processes: 1 doc_root_dir: "/var/www/portals/django-{{gateway_id}}" admin_emails: "[('SGRC Group', '[email protected]')]" django_error_emails: "[('Marcus Christie', '[email protected]'), ('Eroma Abeysinghe', '[email protected]')]" django_database_name: "django_{{ gateway_id }}" django_hidden_airavata_apps: "['django_airavata_dataparsers']" -tusd_vhost_servername: "tus.dev.scigap.org" -tusd_upload_dir: "{{real_user_data_dir}}/tus-temp-dir" +# TODO: setup tusd server +# tusd_vhost_servername: "tus.dev.scigap.org" +# tusd_upload_dir: "{{real_user_data_dir}}/tus-temp-dir" airavata_django_git_branch: "develop" # django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")' cilogon_userinfo_url: "https://cilogon.org/oauth2/userinfo"; +real_user_data_dir: "/media/volume/sdb/gateway-user-data" diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vars.yml index 22df7267a0..b85467db39 100644 --- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vars.yml +++ b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vars.yml @@ -27,17 +27,14 @@ airavata_django_extra_dependencies: #Git hook is not set for this gateway -# No symlink, user_data_dir is same as real_user_data_dir -user_data_dir: "{{ real_user_data_dir }}" #airavata_django_git_branch: "simccs" -vhost_servername: "beta.geogateway.scigap.org" +# vhost_servername: "beta.geogateway.scigap.org" +vhost_servername: "geogateway.js2.scigap.org" vhost_ssl: true -# tus isn't setup yet -tusd_vhost_servername: # sudo certbot --apache certonly -d django.simccs.scigap.org -ssl_certificate_file: "/etc/letsencrypt/live/beta.geogateway.scigap.org/cert.pem" -ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.geogateway.scigap.org/fullchain.pem" -ssl_certificate_key_file: "/etc/letsencrypt/live/beta.geogateway.scigap.org/privkey.pem" +ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem" +ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem" +ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem" django_extra_settings: LOGIN_REDIRECT_URL: "/geogateway_django_app/" diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vars.yml index 49c0381832..33008b7dae 100644 --- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vars.yml +++ b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vars.yml @@ -19,15 +19,11 @@ # --- -#airavata_django_git_branch: "simccs" -#vhost_servername: "django.interactwel.scigap.org" -vhost_servername: "interactwel.org" -vhost_server_redirect: "www.interactwel.org" +vhost_servername: "interactwel.js2.scigap.org" vhost_ssl: true -# sudo certbot --apache certonly -d django.simccs.scigap.org -ssl_certificate_file: "/etc/letsencrypt/live/interactwel.org/cert.pem" -ssl_certificate_chain_file: "/etc/letsencrypt/live/interactwel.org/fullchain.pem" -ssl_certificate_key_file: "/etc/letsencrypt/live/interactwel.org/privkey.pem" +ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem" +ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem" +ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem" interactwel_django_app_branch: "api-integration" airavata_django_extra_dependencies: diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vars.yml index 624a742c04..9b296ba2de 100644 --- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vars.yml +++ b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vars.yml @@ -19,13 +19,11 @@ # --- -#airavata_django_git_branch: "simccs" -vhost_servername: "dev.rnamake.scigap.org" +vhost_servername: "rnamake.js2.scigap.org" vhost_ssl: true -# sudo certbot --apache certonly -d django.simccs.scigap.org -ssl_certificate_file: "/etc/letsencrypt/live/dev.rnamake.scigap.org/cert.pem" -ssl_certificate_chain_file: "/etc/letsencrypt/live/dev.rnamake.scigap.org/fullchain.pem" -ssl_certificate_key_file: "/etc/letsencrypt/live/dev.rnamake.scigap.org/privkey.pem" +ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem" +ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem" +ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem" ## Keycloak related variables tenant_domain: "rnamake" diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vars.yml index 922710f3b4..3c5266208e 100644 --- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vars.yml +++ b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vars.yml @@ -19,11 +19,11 @@ # --- -vhost_servername: "django.seagrid.org" -vhost_ssl: True -ssl_certificate_file: "/etc/letsencrypt/live/django.seagrid.org/cert.pem" -ssl_certificate_chain_file: "/etc/letsencrypt/live/django.seagrid.org/fullchain.pem" -ssl_certificate_key_file: "/etc/letsencrypt/live/django.seagrid.org/privkey.pem" +vhost_servername: "js2.seagrid.org" +vhost_ssl: true +ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem" +ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem" +ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem" ## Keycloak related variables tenant_domain: "seagrid" diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vars.yml index db5f0e600a..c9d36fa213 100644 --- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vars.yml +++ b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vars.yml @@ -32,11 +32,10 @@ airavata_django_extra_dependencies: - name: pyjnius # vhost_servername: "beta.simccs.org" # Temporary use a *.scigap.org domain name -vhost_servername: "beta.simccs.scigap.org" -vhost_ssl: True # Some of the maptool views call into Java code and can take 2-3 minutes to execute vhost_timeout: 300 -# sudo certbot --apache certonly -d django.simccs.scigap.org +vhost_servername: "simccs.js2.scigap.org" +vhost_ssl: true ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem" ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem" ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
