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 2019/06/07 13:30:21 UTC
[airavata] 01/02: AIRAVATA-3076 Fixing cyberwater doc_root_dir
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 bee0ee998707a1b2fe1e3aac2182f22e0941d755
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jun 7 09:26:24 2019 -0400
AIRAVATA-3076 Fixing cyberwater doc_root_dir
And simplifying by specifying the pattern in group vars
---
.../ansible/inventories/scigap/develop/group_vars/django/vars.yml | 3 ++-
.../ansible/inventories/scigap/develop/host_vars/csbglsu/vars.yml | 1 -
.../ansible/inventories/scigap/develop/host_vars/cyberwater/vars.yml | 1 -
.../ansible/inventories/scigap/develop/host_vars/interactwel/vars.yml | 1 -
.../ansible/inventories/scigap/develop/host_vars/nexttdb/vars.yml | 1 -
.../ansible/inventories/scigap/develop/host_vars/pfec-hydro/vars.yml | 1 -
.../ansible/inventories/scigap/develop/host_vars/saver-x/vars.yml | 1 -
.../ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml | 1 -
dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml | 1 -
.../ansible/inventories/scigap/develop/host_vars/simvascular/vars.yml | 1 -
dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml | 1 -
11 files changed, 2 insertions(+), 11 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 ccc07de..5dba854 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
@@ -24,4 +24,5 @@ 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"
-django_wsgi_processes: 1
\ No newline at end of file
+django_wsgi_processes: 1
+doc_root_dir: "/data/portals/django-{{gateway_id}}"
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vars.yml
index 62ce4b0..06ee643 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vars.yml
@@ -20,7 +20,6 @@
---
#airavata_django_git_branch: "simccs"
-doc_root_dir: "/data/portals/django-csbglsu"
vhost_servername: "beta-sciencegateway.brylinski.org"
vhost_ssl: true
# sudo certbot --apache certonly -d django.simccs.scigap.org
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/cyberwater/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/cyberwater/vars.yml
index cefe6d5..e07c0e9 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/cyberwater/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/cyberwater/vars.yml
@@ -20,7 +20,6 @@
---
#airavata_django_git_branch: "simccs"
-doc_root_dir: "/data/portals/django-pfec-hydro"
vhost_servername: "cyberwater.scigap.org"
vhost_ssl: true
# sudo certbot --apache certonly -d django.simccs.scigap.org
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/interactwel/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/interactwel/vars.yml
index 1c20f40..9ee7e17 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/interactwel/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/interactwel/vars.yml
@@ -20,7 +20,6 @@
---
#airavata_django_git_branch: "simccs"
-doc_root_dir: "/data/portals/django-interactwel"
vhost_servername: "django.interactwel.scigap.org"
vhost_ssl: true
# sudo certbot --apache certonly -d django.simccs.scigap.org
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/nexttdb/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/nexttdb/vars.yml
index 16af2ec..f8d4ea8 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/nexttdb/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/nexttdb/vars.yml
@@ -20,7 +20,6 @@
---
#airavata_django_git_branch: "simccs"
-doc_root_dir: "/data/portals/django-nexttdb"
vhost_servername: "geochemsim.org"
vhost_ssl: true
# sudo certbot --apache certonly -d django.simccs.scigap.org
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/pfec-hydro/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/pfec-hydro/vars.yml
index 205bf4d..5bc9a39 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/pfec-hydro/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/pfec-hydro/vars.yml
@@ -20,7 +20,6 @@
---
#airavata_django_git_branch: "simccs"
-doc_root_dir: "/data/portals/django-pfec-hydro"
vhost_servername: "pfec-hydro.scigap.org"
vhost_ssl: true
# sudo certbot --apache certonly -d django.simccs.scigap.org
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/saver-x/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/saver-x/vars.yml
index 95f7b94..30c080a 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/saver-x/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/saver-x/vars.yml
@@ -20,7 +20,6 @@
---
#airavata_django_git_branch: "simccs"
-doc_root_dir: "/data/portals/django-saver-x"
vhost_servername: "beta.saver-x.scigap.org"
vhost_ssl: true
# sudo certbot --apache certonly -d django.simccs.scigap.org
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml
index 8761dc7..f8ada41 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml
@@ -19,7 +19,6 @@
#
---
-doc_root_dir: "/data/portals/django-seagrid"
vhost_servername: "django.seagrid.org"
vhost_ssl: True
ssl_certificate_file: "/etc/letsencrypt/live/django.seagrid.org/cert.pem"
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
index 2b44c50..a49359a 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
@@ -27,7 +27,6 @@ airavata_django_extra_dependencies:
- cython
- git+https://github.com/SciGaP/simccs-maptool.git#egg=simccs-maptool
- pyjnius
-doc_root_dir: "/data/portals/django-simccs"
vhost_servername: "beta.simccs.org"
vhost_ssl: True
# sudo certbot --apache certonly -d django.simccs.scigap.org
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/simvascular/vars.yml
index 73d8538..79f7275 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/simvascular/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/simvascular/vars.yml
@@ -19,7 +19,6 @@
#
---
-doc_root_dir: "/data/portals/django-simvascular"
vhost_servername: "beta.gateway.simvascular.org"
vhost_ssl: True
ssl_certificate_file: "/etc/letsencrypt/live/beta.gateway.simvascular.org/cert.pem"
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml
index 90ba3d7..7adfc5e 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml
@@ -20,7 +20,6 @@
---
#airavata_django_git_branch: "simccs"
-doc_root_dir: "/data/portals/django-usd"
vhost_servername: "beta.sciencegateway.usd.edu"
vhost_ssl: true
# sudo certbot --apache certonly -d django.simccs.scigap.org