You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2017/04/03 16:49:40 UTC
[07/50] airavata git commit: AIRAVATA-2335 Tested PGA vhost-based
config on jetstream
AIRAVATA-2335 Tested PGA vhost-based config on jetstream
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ebc158dd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ebc158dd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ebc158dd
Branch: refs/heads/master
Commit: ebc158ddf56adadae67eec252fe089b0406f109d
Parents: e0110cb
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Mar 14 17:28:33 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Mar 14 17:29:36 2017 -0400
----------------------------------------------------------------------
.../ansible/inventories/geogateway-dev/group_vars/pga/vars.yml | 2 +-
.../ansible/inventories/testing-0.17/group_vars/pga/vars.yml | 1 +
dev-tools/ansible/inventories/testing-0.17/hosts | 2 +-
dev-tools/ansible/roles/pga/defaults/main.yml | 2 +-
dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2 | 4 ++--
5 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebc158dd/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
index 3ddc93e..dc0afea 100644
--- a/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
@@ -8,7 +8,7 @@ pga_group: "pga"
doc_root_dir: "/var/www/html/geogateway-dev"
user_data_dir: "/var/www/user_data"
-vhost_servername: "gw137.iu.xsede.org"
+#vhost_servername: "gw137.iu.xsede.org"
## WSO2 IS related variables
tenant_domain: "airavata.geog"
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebc158dd/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
index dffd691..31683b0 100644
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
@@ -5,6 +5,7 @@ pga_user: "pga"
pga_group: "pga"
doc_root_dir: "/var/www/html/php-gateway"
user_data_dir: "/var/www/user_data"
+#vhost_servername: "{{ groups['pga'][0] }}"
## WSO2 IS related variables
tenant_domain: "prod.seagrid"
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebc158dd/dev-tools/ansible/inventories/testing-0.17/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/hosts b/dev-tools/ansible/inventories/testing-0.17/hosts
index 27f378f..ce939fb 100644
--- a/dev-tools/ansible/inventories/testing-0.17/hosts
+++ b/dev-tools/ansible/inventories/testing-0.17/hosts
@@ -20,4 +20,4 @@
149.165.168.5 ansible_user=centos
[pga]
-149.165.156.102 ansible_user=centos
+149.165.156.11 ansible_user=centos
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebc158dd/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index 1a541b8..069e9ff 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -3,7 +3,7 @@ pga_user: "pga"
pga_group: "pga"
doc_root_dir: "/var/www/html/php-gateway"
user_data_dir: "/var/www/user_data"
-vhost_servername: "mygateway.example.com"
+vhost_servername: "{{ groups['pga'][0] }}"
httpd_confd_file_location:
RedHat: "/etc/httpd/conf.d/pga-{{ gateway_id }}.conf"
Debian: "/etc/apache2/sites-available/pga-{{ gateway_id }}.conf"
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebc158dd/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2 b/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
index 82d67fc..59e8406 100644
--- a/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
@@ -1,8 +1,8 @@
<VirtualHost *:80>
ServerName {{ vhost_servername }}
- DocumentRoot {{ doc_root_dir }}
- <Directory "{{ doc_root_dir }}">
+ DocumentRoot {{ doc_root_dir }}/public
+ <Directory "{{ doc_root_dir }}/public">
AllowOverride All
</Directory>
ErrorLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.error.log