You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by er...@apache.org on 2017/10/12 15:49:51 UTC
[1/3] airavata git commit: Adding new Kentucky gateway
Repository: airavata
Updated Branches:
refs/heads/master 970dc68e6 -> 857b99b6c
Adding new Kentucky gateway
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/72cfc644
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/72cfc644
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/72cfc644
Branch: refs/heads/master
Commit: 72cfc64415467e9fb24696a51c67bf0d780cf093
Parents: 784d3de
Author: Eroma Abeysinghe <er...@gmail.com>
Authored: Wed Oct 11 12:28:51 2017 -0400
Committer: Eroma Abeysinghe <er...@gmail.com>
Committed: Wed Oct 11 12:28:51 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/pga-scigap-prod.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/72cfc644/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index 1f53c8b..4f72b76 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -45,4 +45,5 @@
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugeosurvey"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scbglsu"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/NCSAIndustry"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/Kentucky"
...
[3/3] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by er...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/857b99b6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/857b99b6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/857b99b6
Branch: refs/heads/master
Commit: 857b99b6ca57b7a00d69dcb4da9fdd81b4f7b4bf
Parents: 4a2b956 970dc68
Author: Eroma Abeysinghe <er...@gmail.com>
Authored: Thu Oct 12 11:49:11 2017 -0400
Committer: Eroma Abeysinghe <er...@gmail.com>
Committed: Thu Oct 12 11:49:11 2017 -0400
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 2 +-
.../core/impl/TenantManagementKeycloakImpl.java | 14 +-
.../interfaces/TenantManagementInterface.java | 3 +-
.../services/core/tests/SetupNewGateway.java | 2 +-
.../handlers/IamAdminServicesHandler.java | 13 +-
.../handlers/TenantProfileServiceHandler.java | 50 ++++
dev-tools/ansible/ansible.cfg | 2 +-
.../simvascular/files/pga_config.php.j2 | 290 +++++++++++++++++++
.../production/pga_config/simvascular/vars.yml | 3 +
.../templates/airavata-server.properties.j2 | 1 -
.../common/utils/ApplicationSettings.java | 4 -
.../airavata/common/utils/ServerSettings.java | 1 -
.../main/resources/airavata-server.properties | 1 -
.../service/handler/RegistryServerHandler.java | 15 +
14 files changed, 379 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[2/3] airavata git commit: Adding new Kentucky gateway
Posted by er...@apache.org.
Adding new Kentucky gateway
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4a2b9562
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4a2b9562
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4a2b9562
Branch: refs/heads/master
Commit: 4a2b9562743a0df4385e709a2e41d30cfbab1fb0
Parents: 72cfc64
Author: Eroma Abeysinghe <er...@gmail.com>
Authored: Wed Oct 11 12:29:30 2017 -0400
Committer: Eroma Abeysinghe <er...@gmail.com>
Committed: Wed Oct 11 12:29:30 2017 -0400
----------------------------------------------------------------------
.../production/pga_config/Kentucky/vars.yml | 18 +++++------
.../production/pga_config/Kentucky/vault.yml | 34 ++++++++++----------
2 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/4a2b9562/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vars.yml
index 62ca232..f4c8564 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vars.yml
@@ -25,11 +25,11 @@ user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/{{ gateway_id }}"
vhost_servername: "hpcgateway.uky.edu"
-vhost_ssl: false
+vhost_ssl: true
# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
## Keycloak related variables
tenant_domain: "{{ gateway_id }}"
@@ -42,17 +42,17 @@ oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.wel
auth_options:
- name: "University of Kentucky HPC Gateway"
oauth_grant_type: "password"
- - name: "CILogon"
- oauth_grant_type: "authorization_code"
- oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
- logo: "/assets/cilogon-logo-24x24-b.png"
+# - name: "CILogon"
+# oauth_grant_type: "authorization_code"
+# oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
+# logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
gateway_id: "university-of-kentucky-hpc-gateway"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-#gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCajV9E/lBaAdpDecuhB2/Qv3losWr+zNVMwJcpq8ZPiWKA9AFJNT8TW3/VJC/RtrzVzmITMqJYOaQM5mPAOn5D6T7y2CvHxIFL5MktNc1dNiCXbg0nT+zQFirIGNskbs9xE5AWJDsNXOWj1Hjaffk80WjpRNvreXV3mrvdSi0BQYKxp0zIuXNgSR8/LjvYSWn+L/xhrP5eMYcOPlVsrkp1O7imeiib4je0ZNzsd6YXIfNhNoJIzod0AinpmM85zJ/OuemHePE0c4hiU7caOxhBiRxzNCSpN+IFLvo/l8txdnXP1nTwvahZtvVaxuj4OHEeaLSVU8CPxmwBGQEuN4AP"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8nCMkOgELG+FgKIC5wTdGn6ZRlnCfhn5ebrpMDagXTM0lacLplKThhOg4EXFOjxGOW83f4HBjKBJXpqRUunCL053Foox9/xqtk6Sa7jwRugL0rIBQJC4hZiHin2W0zHseoIQtghz+AbyofjUABYxOCpbKUuR3plyVv/68iqZOscPmVDw2bS9MLBHRZI5BvZ8FwKSEtn7uEV+XXvI4FXaRQfTg/arbgLietD+y+EyxOkSW3PXtu4xvQ2e6AA9LTKn2fGLHS/atEXgS+pBxVKWcCgpOxUCgNq/F8OQWEVDGFG3Pz3b45n7O62YWUgbS1Jn+FQVRw5Pfb4P31+hF3EJX"
## Portal related variables
super_admin_portal: "false"
http://git-wip-us.apache.org/repos/asf/airavata/blob/4a2b9562/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vault.yml
index 6561088..6b994f7 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-37626263363332353866343061643735643838653034373361396564333636643166333965316235
-3231333239643538653366393638313061316261386561300a313835333563383833313962346635
-33646534613662383863326361353165646164373766366638633564656161383838356237316634
-3936386237383330630a613239323032643638376138313561646666613731303334636562333832
-65623661306535656363316461633964316365323532616634643662623839366435326264613230
-33313962363036666334613134326131313538656631376335376438316630383062353465643964
-39313536373439333333653065383135313330666462653566353732626638383635383066643963
-66316637306231653761396230316637313064636633353665343064313132383466313935313563
-34656331663966393139376633386631316139643131323764623766613066353631323330363839
-32363939646531376237383436326137336430663932633463643132353836323561626562393132
-34376565636361626636366365336138343532643639653333376234376466396166323036323439
-33363866653730623234323136326363313534633863396263663463656230616132386531333132
-39366538613731346136323733383766643065353836346466316430343836353633306338306438
-31326336393461666461343532386139616663646138323137373663643865653936353962333231
-61343861626562623061336462316336393965333231383139373739336339643462383661373061
-64633432306166396337653934633561323031316363346433633039323366326635333065323862
-3262
+30373939346635303937356362366635346331313836393439623837626434366339343030613137
+6565346138613639303334666666366361353565313265610a656364643466303034336538613630
+62623334383730303038376166346630386332373631353061333532373535666534373734353635
+6430656633316631340a613964383138613838616237353362383630396336323461393162336330
+31663131613533346636373737663263646334353339613836303531383332636564306263666136
+63306163626435393633316262306562333039336261373263383031343864633963386266353737
+61323565643663333363356464663030316362643630366563636533636239633638323731636339
+36306463393036666162663862393232663264636336616562376232326436383234396632323864
+37323035396134333239613866636439326561326131613863393338616666646666313439393836
+33386333663238633161373866326437323064346662383031353234353137633832356230636636
+30656362343966343336623633373039636138666366666231646165656362396262633530393463
+32353566323563653831633561373262383239636664663739363833623261333931663366656135
+61333734316364343738363361383637306336363063316165343465663436363864656661396463
+64663761306263346461396434363830363465666232646261653830386534633661383336323532
+61303465373432663632656131333439656438633330343263636630636461316161643930343332
+62313135613131393934633834643935656437326236363532343239616431626239346135393264
+3161