airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [54/61] [abbrv] airavata git commit: Merge branch 'master' into develop
Date Wed, 24 May 2017 21:35:04 GMT
Merge branch 'master' into develop


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/701f36a7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/701f36a7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/701f36a7

Branch: refs/heads/master
Commit: 701f36a7a138753ae944a63a2f11b8f89825a3c9
Parents: f19cc0c f6f2adc
Author: Marcus Christie <machristie@apache.org>
Authored: Mon May 22 16:08:48 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Mon May 22 16:08:48 2017 -0400

----------------------------------------------------------------------
 dev-tools/ansible/.gitignore                    |   1 +
 dev-tools/ansible/README.md                     |  21 ++
 .../dreg-production/files/pga-ssl-vhost.conf.j2 |   2 +
 .../dreg-production/group_vars/pga/vars.yml     |   2 +-
 .../cornell-dnasequence/pga-ssl-vhost.conf.j2   |  31 ---
 .../pga_config/cornell-dnasequence/vars.yml     |  63 ------
 .../pga_config/cornell-dnasequence/vault.yml    |  18 --
 .../pga_config/nanoconfinement/vars.yml         |  55 +++++
 .../pga_config/nanoconfinement/vault.yml        |  18 ++
 .../production/pga_config/ultrascan/vars.yml    |   5 +-
 dev-tools/ansible/pga-scigap-prod.yml           |   2 +-
 dev-tools/ansible/requirements.txt              |   1 +
 dev-tools/ansible/roles/java/vars/main.yml      |   8 +-
 dev-tools/ansible/roles/pga/defaults/main.yml   |   4 +
 dev-tools/ansible/roles/pga/files/ssl.conf      | 217 +++++++++++++++++++
 dev-tools/ansible/roles/pga/tasks/main.yml      |   8 +
 .../roles/pga/templates/pga-ssl-vhost.conf.j2   |   2 +
 17 files changed, 338 insertions(+), 120 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/701f36a7/dev-tools/ansible/README.md
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/701f36a7/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------


Mime
View raw message